From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 12 Oct 2017 19:03:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~359
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/85530b3c52c2dc20cacb665c695402d2aa503954

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

85530b3c52c2dc20cacb665c695402d2aa503954