From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 18 Nov 2011 08:55:44 +0000 (+0100)
Subject: Merge branches 'master' and 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.1-4~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2f1f135574b837d17507d69b901a72e1fcdcdce6;hp=-c;p=sfa.git

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

2f1f135574b837d17507d69b901a72e1fcdcdce6