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)
commit6872209af2d5ec927820f2b333b8d3b112260957
treea6b76514f560e7e760f72b3a32e9bebcae05e8af
parent1ca62657b0e80664a840e4856618dc5103fb1252
parent6b2452ee7afc1b8b5723497aa04d3b985cbb726f
Merge branch 'master' into senslab2
sfa/managers/registry_manager.py