From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 14 Nov 2011 14:34:27 +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~310
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1896c4d204a0088202cba4300ffdeef640b69121;p=sfa.git

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

1896c4d204a0088202cba4300ffdeef640b69121