From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 18 Jul 2012 15:01:56 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-14~96
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7ee4051001a4d1fa7d2cbd35effda5f45067f2c7

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

7ee4051001a4d1fa7d2cbd35effda5f45067f2c7