From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 15 Dec 2010 15:55:43 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-10~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=2a40a29767d83d81af073b1141fc195021a75a5f

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

2a40a29767d83d81af073b1141fc195021a75a5f