merged master onto senslab2, manually solved conflicts in setup.py
[sfa.git] / config / registries.xml
1 <registries>
2         <registry addr="" hrn="" port=""/>
3 </registries>