From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 16 Mar 2012 16:28:59 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-4~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8f74a4972caa1a488839b3f2990f8a8b863fb987;p=sfa.git

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

8f74a4972caa1a488839b3f2990f8a8b863fb987