Merge branch 'master' into senslab2
Sandrine Avakian [Wed, 12 Dec 2012 09:26:14 +0000 (10:26 +0100)]
1  2 
sfa/client/sfi.py
sfa/managers/registry_manager.py

Simple merge
Simple merge