From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 14 Mar 2012 09:38:27 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~208
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=759321e13f13d3851a902470ad462b39863fa20d

Merge branch 'master' into senslab2
---

759321e13f13d3851a902470ad462b39863fa20d