From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Fri, 18 Nov 2011 16:39:08 +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~273
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=81ec6a0c9ab0e8907af3a8d59fcb6f941aca400b

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

81ec6a0c9ab0e8907af3a8d59fcb6f941aca400b