From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 22 May 2012 14:38:01 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-24~19^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=5217d46556d445cf0b91d95811d112d758ba8be1

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

5217d46556d445cf0b91d95811d112d758ba8be1