From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 16 Dec 2010 22:45:15 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.0-rc18~162^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c0660d4332e65020c3e8c4900015dfc4caea46dd;p=build.git

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

c0660d4332e65020c3e8c4900015dfc4caea46dd