From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sun, 20 Jan 2013 13:16:07 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.2.1~103
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9bff5e155b8b980d5e5720cc80ffe0edc9c50957;p=build.git

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

9bff5e155b8b980d5e5720cc80ffe0edc9c50957