From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 5 Jun 2012 12:22:11 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-10~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=98345c5b4ead0dd9e622e42afa2eb3084f37e8f3;p=sfa.git

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

98345c5b4ead0dd9e622e42afa2eb3084f37e8f3