From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 9 Feb 2017 02:24:33 +0000 (+0100)
Subject: Merge branch 'geni-v3' of git://git.onelab.eu/sfa into geni-v3
X-Git-Tag: sfa-3.1-22~11
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8e558be62ca1e048cedb76d6036d1acbfa827bd4

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

8e558be62ca1e048cedb76d6036d1acbfa827bd4