From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 6 Dec 2011 14:21:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-3~37
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=196db84cd78fb47e19188ab976def62523a2de9b

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

196db84cd78fb47e19188ab976def62523a2de9b