From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 7 Dec 2010 18:59:31 +0000 (+0100)
Subject: Merge branch 'master' of git.onelab.eu:/git/build
X-Git-Tag: 5.0-rc17~31
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c12a8ed6c6af1f59940b3538bdb0d3b945915114;p=build.git

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

c12a8ed6c6af1f59940b3538bdb0d3b945915114