From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Wed, 26 Oct 2011 09:29:39 +0000 (+0200)
Subject: Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
X-Git-Tag: sfa-2.1-24~3^2~315^2~5
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1b51455d89c8e195a05349a9e51d88e327298f41

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

1b51455d89c8e195a05349a9e51d88e327298f41