From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 4 May 2018 20:04:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~334
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/275f3b26560a44099dff762776277812ef0f122f

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

275f3b26560a44099dff762776277812ef0f122f