From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 14 Aug 2017 19:57:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~377
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b0c95231a6a946fd7b8a7373d1683e4c7d07c2ef

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

b0c95231a6a946fd7b8a7373d1683e4c7d07c2ef