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

Merge branch 'master' into senslab2
---

a4a9bf9de22e4dd68ec84d388524ba1c15e86d39