From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 4 Oct 2017 21:34:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~365
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/130f904b90dd8508a210c89f2f2cd76056adc397

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

130f904b90dd8508a210c89f2f2cd76056adc397