From: beierlm <mark.beierl@canonical.com>
Date: Sat, 16 May 2020 00:41:16 +0000 (-0400)
Subject: Merge branch 'master' into v7.0
X-Git-Tag: v7.1.0rc1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F8922%2F1;p=osm%2Fosmclient.git

Merge branch 'master' into v7.0

Change-Id: I48a508a25fb86c3c2ce480b24053aded97a56f85
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

cc0db9ace36de244a1ce66b6694547a75239aa09