From: beierlm <mark.beierl@canonical.com>
Date: Fri, 22 May 2020 15:22:48 +0000 (+0200)
Subject: Merge "Merge branch 'master' into v7.0" into v7.0
X-Git-Tag: v7.1.0rc2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=09d86dfb0ab2d18aa5b8909a19cf90ac09b1ba05;hp=-c;p=osm%2Fosmclient.git

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

09d86dfb0ab2d18aa5b8909a19cf90ac09b1ba05