From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 7 Dec 2011 19:51:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-3~21
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0fbab41f2e1caad1e2bfdd47440598db5e5591da;p=sfa.git

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

0fbab41f2e1caad1e2bfdd47440598db5e5591da