From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 4 Jan 2011 09:15:01 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.0-rc18~131^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=40ca59e93ab1d6f6482f9889653685e1491da510;p=build.git

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

40ca59e93ab1d6f6482f9889653685e1491da510