From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 18 Jan 2013 07:44:40 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.2.1~122
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e1e312e79829c870fc9f79f832170f848a508494;p=build.git

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

e1e312e79829c870fc9f79f832170f848a508494