From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 24 Jan 2013 22:08:51 +0000 (+0100)
Subject: Merge branch 'upstreammaster' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5f5f29e2bc00befe5b7b601806ef5a7e44349b75;p=sfa.git

Merge branch 'upstreammaster' into senslab2
---

5f5f29e2bc00befe5b7b601806ef5a7e44349b75