From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 3 Oct 2017 10:12:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~368
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/4f86a91d6141b36a269967dc34ad65f4e8b1dfe5

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

4f86a91d6141b36a269967dc34ad65f4e8b1dfe5