From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 26 Oct 2010 11:29:50 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-8~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=17245c2d24267fe61b1281b358c4c77e6dd47a13;p=sfa.git

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

17245c2d24267fe61b1281b358c4c77e6dd47a13