From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Fri, 21 Oct 2011 06:49:54 +0000 (+0200)
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~322
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f1fcfbd0c240b33ecec5f2c51364af57a4fcca21;p=sfa.git

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

f1fcfbd0c240b33ecec5f2c51364af57a4fcca21