From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 12 Jul 2012 12:27:07 +0000 (+0200)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~131
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=b6dcfc034473c011988fba0d02bbeb6406925465

Merge branch 'master' into senslab2
---

b6dcfc034473c011988fba0d02bbeb6406925465