From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri, 2 Nov 2018 13:19:01 +0000 (+0100)
Subject: Merge branch 'master' into netslice
X-Git-Tag: v5.0.0~15^2~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=inline;h=ba0dbed4d7fe4cd1ee800a4a3402157224fd7aff;p=osm%2FNBI.git

Merge branch 'master' into netslice
---

ba0dbed4d7fe4cd1ee800a4a3402157224fd7aff