From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 6 Oct 2010 07:56:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-2~8^2~3
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=47c8f4ead3bb58adabb9f4601acb4796a566187b

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

47c8f4ead3bb58adabb9f4601acb4796a566187b