From: Nicolas Turro <nturro@sfa.grenoble.senslab.info>
Date: Mon, 19 Sep 2011 14:29:40 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.f-lab.fr/git/sfa
X-Git-Tag: sfa-2.1-24~3^2~332
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=65d5ac8b2000211ae5afd75db288d2cd3e9ef2f9

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

65d5ac8b2000211ae5afd75db288d2cd3e9ef2f9