From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 5 Feb 2017 12:10:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~404
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/8be702bf602118b19d4482566e4239c023b7fe54

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

8be702bf602118b19d4482566e4239c023b7fe54