From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 15 Nov 2011 14:22:46 +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~293
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=71ac4396f80d826e2a5422ab710a3db868a5692f;p=sfa.git

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

71ac4396f80d826e2a5422ab710a3db868a5692f