From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 4 Feb 2011 08:26:58 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.0-rc20~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=062880617a56900d80a22ef79b8a5c068169b96f;p=build.git

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

062880617a56900d80a22ef79b8a5c068169b96f