From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Fri, 13 Jul 2012 11:21:37 +0000 (+0200)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~126
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=dd07ad19e9c39e121c6ff177a863c9e7da1f1eac

Merge branch 'master' into senslab2
---

dd07ad19e9c39e121c6ff177a863c9e7da1f1eac