Removed remaining problems from merge.
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 27 Oct 2011 13:46:41 +0000 (15:46 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 27 Oct 2011 13:46:41 +0000 (15:46 +0200)
commit60e5f6d90d2334224f0a6ef39bd1d522ccb259f4
tree2a0d1a47d0c5afe474837537bef92e41f8736041
parent9b8234d5a13b82e9c480d68883cef7ee14d0fc68
Removed remaining problems from merge.
sfa/client/client_helper.py
sfa/managers/registry_manager_slab.py
sfa/trust/auth.py