From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 19 Aug 2018 16:09:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~312
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6f383d6073b68409e8da243356eccf5e2847f264

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

6f383d6073b68409e8da243356eccf5e2847f264