From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 4 Jul 2018 19:11:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~316
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/0bbc25c9c5c3ab644d6771ccbd87f26c3d7552bf

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

0bbc25c9c5c3ab644d6771ccbd87f26c3d7552bf