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

Merge branch 'master' into senslab2
---

23666284b256845f8c04b287b9560f87f8629bc9