From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 14 Dec 2011 16:53:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-5~2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=96eb4cdaa6e16333d80095a4012cb71937b70030

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

96eb4cdaa6e16333d80095a4012cb71937b70030