From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 22 Apr 2013 12:49:39 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myplc
X-Git-Tag: myplc-5.2-3~1
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=b6808ea906d1123c79f3da3627ed9870e77db1cb

Merge branch 'master' of ssh://git.onelab.eu/git/myplc
---

b6808ea906d1123c79f3da3627ed9870e77db1cb