From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 7 May 2018 19:48:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~333
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/473bbb7234dc21a74b3d7ed0115a02ca3379014b

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

473bbb7234dc21a74b3d7ed0115a02ca3379014b