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

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

f1e85f10f998c41c8974e319e1f950edf4e35aa4