From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 8 Sep 2011 11:54:44 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-36~18
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0d48b2ca1c2f5f66712b15d7542afbb6a0c67409;p=sfa.git

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

0d48b2ca1c2f5f66712b15d7542afbb6a0c67409