From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 17 Nov 2011 19:22:09 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.1-4~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=845abc0f39d56c0f1120f0a1226de5321076d10a;p=sfa.git

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

845abc0f39d56c0f1120f0a1226de5321076d10a