From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 15 Dec 2011 09:24:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.0-rc27~171
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=49c321be8f65c49148d7ca74217830cbf0287f51;p=build.git

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

49c321be8f65c49148d7ca74217830cbf0287f51