From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 10 Dec 2013 13:22:55 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=493ab2f045f69486cdb0f9d713ee900bfee01174;p=infrastructure.git

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

493ab2f045f69486cdb0f9d713ee900bfee01174