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

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

689defdf98d5b4c9698c0f64beff4ef61055cac9