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

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

386763dca287c6a8c2a467e1a2484cf6a44785fa