merges master (so, no sfa-cm anymore)
[sfa.git] / sfa / generic / nitos.py
2012-09-17 Mohamed LarabiFirst draft of the Nitos federation with SFA