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