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

Merge branch 'master' into senslab2
---

bc77b3e1ce73d7f748d9cc978472dba246034d74