From: beierlm <mark.beierl@canonical.com>
Date: Thu, 28 May 2020 16:26:40 +0000 (+0200)
Subject: Merge "Merge branch 'master' into v7.0" into v7.0
X-Git-Tag: v7.1.0rc5^0
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fosmclient.git;a=commitdiff_plain;h=326fae1abadf8c3c1bd1207178d3fca3add675e2

Merge "Merge branch 'master' into v7.0" into v7.0
---

326fae1abadf8c3c1bd1207178d3fca3add675e2