From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 10 Sep 2012 08:21:37 +0000 (+0200)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~89
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d4bf21b9cd5596d72d5c414444a8f3b9708366b5

Merge branch 'master' into senslab2
---

d4bf21b9cd5596d72d5c414444a8f3b9708366b5