From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri, 28 Sep 2018 10:13:44 +0000 (+0200)
Subject: Merge branch 'master' into netslice
X-Git-Tag: v5.0.0~15^2~5
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b69fb3ca37645088483959976edbfc7fda66df8d;p=osm%2FNBI.git

Merge branch 'master' into netslice
---

b69fb3ca37645088483959976edbfc7fda66df8d