From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 21 Nov 2011 13:22:47 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-0~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=94d490c3ec27f1f51484d9f43f8553061f9945bb;p=sfa.git

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

94d490c3ec27f1f51484d9f43f8553061f9945bb