Merge branch 'upstreammaster' into senslab2
Thierry Parmentelat [Thu, 24 Jan 2013 22:08:51 +0000 (23:08 +0100)]
1  2 
setup.py
sfa/client/sfi.py
sfa/managers/registry_manager.py

diff --cc setup.py
Simple merge
Simple merge
Simple merge