Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 18 Oct 2012 12:56:14 +0000 (14:56 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 18 Oct 2012 12:56:14 +0000 (14:56 +0200)
1  2 
sfa/managers/registry_manager.py

Simple merge