From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 1 Aug 2018 21:39:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~316
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/2d7441f381c0ecd2b110b4af47fd9003c7d46773

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

2d7441f381c0ecd2b110b4af47fd9003c7d46773