From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 3 Jul 2013 06:26:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=df87a9ed20b7623996ca673ee4897050d87aea8d;p=infrastructure.git

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

df87a9ed20b7623996ca673ee4897050d87aea8d