From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 27 Jun 2018 20:48:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~318
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/66adbf6a055c877a82fce52767bed7094d0f73a9

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

66adbf6a055c877a82fce52767bed7094d0f73a9