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

Merge branch 'master' into senslab2
---

b47e82ba386c944c888970cc254b09d80ac112a7