From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 2 Jan 2015 14:51:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.3.7~19
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=069ac606dcbe40609c95621dfcf0744d92290886;p=build.git

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

069ac606dcbe40609c95621dfcf0744d92290886