From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 29 Oct 2012 08:06:46 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~43
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=bcddcccb27539888e5ff85da4601c3eeadcfcf4f

Merge branch 'master' into senslab2
---

bcddcccb27539888e5ff85da4601c3eeadcfcf4f