From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Tue, 4 Jun 2013 07:57:01 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-26~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b3b6345e52980aecb6bc05c3346e391b91e3afeb;p=sfa.git

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

b3b6345e52980aecb6bc05c3346e391b91e3afeb