From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 6 Dec 2011 08:13:45 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-2~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=c93d4d0631f5a295d209c6cb6f40ead6e2e97913

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

c93d4d0631f5a295d209c6cb6f40ead6e2e97913