From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 30 Aug 2011 07:45:44 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6f918d085f0660ddce5ad953868f7b5a401f3bf4;p=infrastructure.git

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

6f918d085f0660ddce5ad953868f7b5a401f3bf4