From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 30 May 2018 07:37:44 +0000 (+0200)
Subject: Merge branch 'noslicemgr' into geni-v3
X-Git-Tag: sfa-4.0-1~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0ce89bde3d8e9b22f8949c90b6ca37a81acf4b06;hp=--cc;p=sfa.git

Merge branch 'noslicemgr' into geni-v3
---

0ce89bde3d8e9b22f8949c90b6ca37a81acf4b06