From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 30 Dec 2010 20:47:29 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-12~22
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6814d0f0909436d6cd5ac4a1188cfa75bb192b5b;p=sfa.git

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

6814d0f0909436d6cd5ac4a1188cfa75bb192b5b