From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 20 Aug 2018 21:28:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~311
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ae2ad38040f8515caa79bf274ddc345c6efeb6ef

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

ae2ad38040f8515caa79bf274ddc345c6efeb6ef