From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 21 Jun 2012 15:26:06 +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~152
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1db1a879ffde8991aa95dd80142d555551655e88

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

1db1a879ffde8991aa95dd80142d555551655e88