From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 17 Jun 2010 08:11:21 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
X-Git-Tag: foo~110^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=613abd027e1b01c9c2030c08bf036f4c75ba0a4a;p=infrastructure.git

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

613abd027e1b01c9c2030c08bf036f4c75ba0a4a