From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 29 Nov 2011 09:20:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-1~3^2~10
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=11f2975e4b378dae621617c4d12a2602432e757f

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

11f2975e4b378dae621617c4d12a2602432e757f