From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 28 Sep 2015 14:01:27 +0000 (+0200)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-19~4
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=4ef76bd85ea24906c4ebb580c896fe1084d6ba88

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

4ef76bd85ea24906c4ebb580c896fe1084d6ba88