From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 4 Jun 2017 12:55:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~379
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/1020a888346295466acc6cd3c366760f434d3f6c

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

1020a888346295466acc6cd3c366760f434d3f6c