From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 13 Dec 2011 08:29:45 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-5~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bbc9bba9db868983039901fc247677d6476d8ed4;p=sfa.git

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

bbc9bba9db868983039901fc247677d6476d8ed4