From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 22 May 2010 19:31:27 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
X-Git-Tag: foo~144
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=04843e968e59fd9915c295a02db1e2e4a96ffd35;p=infrastructure.git

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

04843e968e59fd9915c295a02db1e2e4a96ffd35