Merge branch 'master' into senslab2
Sandrine Avakian [Thu, 18 Oct 2012 12:56:14 +0000 (14:56 +0200)]
1  2 
sfa/managers/registry_manager.py

Simple merge