From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 15 Nov 2011 13:27:15 +0000 (+0100)
Subject: Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
X-Git-Tag: sfa-2.1-24~3^2~297
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=105d3b993e70d0a4fc8232cffdad918048c5ad32

Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
---

105d3b993e70d0a4fc8232cffdad918048c5ad32