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

Merge branch 'master' into senslab2
---

6872209af2d5ec927820f2b333b8d3b112260957