From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 26 Oct 2011 10:40:27 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.1-1~33
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=41c41945e7cfdcfb92a3fce70764a714f5bc8086;p=sfa.git

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

41c41945e7cfdcfb92a3fce70764a714f5bc8086