From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Mon, 7 Nov 2011 07:51:38 +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~312^2~4
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=2779895bd4df9bbf972eeb5ebe4bd831b511706a

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

2779895bd4df9bbf972eeb5ebe4bd831b511706a