From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 6 Oct 2017 20:02:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~363
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b2871268cde63d2dd4d92c1313c396afb2807933

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

b2871268cde63d2dd4d92c1313c396afb2807933