From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 3 Oct 2017 14:28:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~367
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c2629bc08d081262a7fd1cbd9d52acb5f44bd8ec

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

c2629bc08d081262a7fd1cbd9d52acb5f44bd8ec