Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 12 Dec 2012 09:26:14 +0000 (10:26 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 12 Dec 2012 09:26:14 +0000 (10:26 +0100)
commit23666284b256845f8c04b287b9560f87f8629bc9
tree720451dae67fc3d2bbda35296829107b5ff17ead
parent88dadc32348e46f477e8f9cfbcbc65f53b85ba12
parentf56515411fd74aaa036cd1c7138da353e7fb7712
Merge branch 'master' into senslab2
sfa/client/sfi.py
sfa/managers/registry_manager.py