From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 2 Dec 2010 18:04:55 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
X-Git-Tag: foo~47
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=02c2de23d219a68fe98b04a282d91206aa1b47b1;p=infrastructure.git

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

02c2de23d219a68fe98b04a282d91206aa1b47b1