From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 14 Jun 2018 21:31:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~321
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/77c75ebf0c822816a428da91db56e421796d499b?hp=-c

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

77c75ebf0c822816a428da91db56e421796d499b