From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 28 Mar 2012 09:56:17 +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~189^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7d3140aa22406b54c32e0a830e969cfe4b699828;p=sfa.git

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

7d3140aa22406b54c32e0a830e969cfe4b699828