From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Thu, 10 Oct 2013 10:02:28 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-27~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=54da878dd1f73da36c104b3cc4d394d37a6cbcce

Merge branch 'master' of ssh://git.onelab.eu/git/sfa
---

54da878dd1f73da36c104b3cc4d394d37a6cbcce