From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 6 Jun 2017 18:56:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~384
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/8498593a634e3d32b3b9417907c31bc95b6122f4

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

8498593a634e3d32b3b9417907c31bc95b6122f4