From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Wed, 16 Nov 2011 14:12:17 +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~283
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=2701a37b1f270df160b9a03b29b0148013406390

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

2701a37b1f270df160b9a03b29b0148013406390