From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 25 Oct 2011 16:59:50 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.1-1~36
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=4752b14b76eda8764c5995997d3c91d77788eb5d

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

4752b14b76eda8764c5995997d3c91d77788eb5d