From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 21 Jan 2020 17:45:41 +0000 (+0000)
Subject: Merge branch 'master' into v7.0
X-Git-Tag: v7.0.1rc2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c1a885c53b716ce802d2ce62727a5dcafbbd7032;p=osm%2Fosmclient.git

Merge branch 'master' into v7.0

Change-Id: Id80cf649873e7678b1cda77102407be2b5628824
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

4c66727a1178c3b13aa1a809cd9ece03b16bbdb1