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

Merge branch 'master' into senslab2
---

a7f2c200e3337fe74e92562f1aeb9d6f8c1eb63c