Merge branch 'master' of ssh://git.onelab.eu/git/myplc
Thierry Parmentelat [Thu, 9 Jan 2014 11:46:05 +0000 (12:46 +0100)]

Trivial merge