From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 10 Nov 2011 14:40:23 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~312^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=36135942ed4dd09cbae187005eb94d70c60f3164;p=sfa.git

Merge branch 'master' into senslab2
---

36135942ed4dd09cbae187005eb94d70c60f3164