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

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

e52ee350618d8cbbe2ab147bfb2cef6507d6e12e