From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 28 Nov 2011 13:13:09 +0000 (+0100)
Subject: Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
X-Git-Tag: sfa-2.1-24~3^2~267
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8bcc7333f98a9bd37c38649aa66ea78bc880f1c4;p=sfa.git

Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
---

8bcc7333f98a9bd37c38649aa66ea78bc880f1c4