From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 3 Apr 2013 13:05:39 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.2.2~54
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=320aba655a37f9e48959282104440ff5824c4ea5;p=build.git

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

320aba655a37f9e48959282104440ff5824c4ea5