From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 9 Sep 2011 16:00:56 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-36~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=737976322520094b9a8b1bede00c88b43e5b7502;p=sfa.git

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

737976322520094b9a8b1bede00c88b43e5b7502