Merge branch 'noslicemgr' into geni-v3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 30 May 2018 07:37:44 +0000 (09:37 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 30 May 2018 07:37:44 +0000 (09:37 +0200)

Trivial merge