From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 3 Jan 2011 16:31:28 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.0-rc18~134
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9fd099773d3915beac45e65b03fdce36b6b03c88;p=build.git

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

9fd099773d3915beac45e65b03fdce36b6b03c88