From: Nicolas Turro <nturro@sfa2.grenoble.senslab.info>
Date: Thu, 27 Oct 2011 15:04:43 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.f-lab.fr/git/sfa
X-Git-Tag: sfa-2.1-24~39
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=18317236953434dfa9ea41328fc21731039e55f1

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

18317236953434dfa9ea41328fc21731039e55f1