From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Tue, 17 Sep 2013 09:46:21 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-27~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=98b6d16b2cd0cdeea52ea6bc07b06b2685f6aa36;p=sfa.git

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

98b6d16b2cd0cdeea52ea6bc07b06b2685f6aa36