From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 4 Oct 2017 18:16:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~366
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/64185ff94c6087eb7046f509f748e7b4e270ae65

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

64185ff94c6087eb7046f509f748e7b4e270ae65