From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 11 May 2012 16:23:40 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-6~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3469e7fb150342f02487ab723c88e8eb72de5c8e;p=sfa.git

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

3469e7fb150342f02487ab723c88e8eb72de5c8e