From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 21 Mar 2011 22:06:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.0-rc21~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b6b70c69b9c0cafe93f63697994244d51cd057e4;p=build.git

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

b6b70c69b9c0cafe93f63697994244d51cd057e4