beremiz

Merge, with surprizingly little conflicts

2018-11-23, Edouard Tisserant
15f18dc8b56a
Merge, with surprizingly little conflicts
<?xml version='1.0' encoding='utf-8'?>
<BaseParams Name="python" IEC_Channel="0"/>