From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 23 Jul 2018 21:28:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~317
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6a0d00faf06b4726286bbfcb216c382ca2e23bd0?hp=-c

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

6a0d00faf06b4726286bbfcb216c382ca2e23bd0