From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 8 Nov 2011 00:12:32 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~312^2~3
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=084ce81754d81170842189890eca60e31589fc28

Merge branch 'master' into senslab2
---

084ce81754d81170842189890eca60e31589fc28