From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Mon, 13 Jan 2014 16:24:38 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~32
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=9ef6512597e8cd16e30105acdb6789685df25e94

Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
---

9ef6512597e8cd16e30105acdb6789685df25e94