From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 13 Jun 2018 22:16:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~320
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/bfd36863a0f238bffef8806978aebde4dd312768

Merge remote-tracking branch 'upstream/master'
---

bfd36863a0f238bffef8806978aebde4dd312768