beremiz

Merge, with surprizingly little conflicts

2018-11-23, Edouard Tisserant
15f18dc8b56a
Merge, with surprizingly little conflicts
[TOPOLOGY]
NetName=None
Nodes=0x01
Node2Present=0x01
Node2Name=SlaveNode
Node2DCFName=Slave_0_0.eds
EDSBaseName=eds