Merge branch 'master' of ssh://git.onelab.eu/git/myplc
Thierry Parmentelat [Mon, 22 Apr 2013 12:49:39 +0000 (14:49 +0200)]

Trivial merge