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

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

1c953afae35c6dd5ba829a9ebd5728bbdf3688c3