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

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

8c0bf91e46675c699393dc209794ade4733ef3da