From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Fri, 23 Mar 2012 16:53:05 +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~195
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=35eb873ce8c7c096a897c8d1a3e1d8a9f6e4c74e

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

35eb873ce8c7c096a897c8d1a3e1d8a9f6e4c74e