Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 16 Jan 2012 14:17:48 +0000 (15:17 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 16 Jan 2012 14:17:48 +0000 (15:17 +0100)
commit013d9db0fd63345c1d24b2b15b59d3dc5036bc18
tree91d8caf9c58f414c4ea4a7f75b13b9960ac2fbda
parent6cebf6bbc4b5a94e3530e5f43a61f7191ced7a1b
parentf7f57707d12dd626d4293dc1e34451fc23763052
Merge branch 'master' into senslab2

Conflicts:
sfa/managers/registry_manager.py
setup.py
sfa/client/sfi.py
sfa/plc/plslices.py
sfa/trust/credential.py