From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 29 Jan 2013 16:28:51 +0000 (+0100)
Subject: Merge branch 'senslab2'
X-Git-Tag: sfa-2.1-24~3
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8f8c136cf823125029bf154a2423087f7cadbcd1

Merge branch 'senslab2'
---

8f8c136cf823125029bf154a2423087f7cadbcd1