From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 26 Feb 2013 15:40:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.2.1~25
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f39ce6445ca4960497cafe05cdffa248091095e4;p=build.git

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

f39ce6445ca4960497cafe05cdffa248091095e4