From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 12 Dec 2011 13:29:37 +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~258
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6d642a325266e2e1508c0c7b0317dd510ba71b81;p=sfa.git

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

6d642a325266e2e1508c0c7b0317dd510ba71b81