From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 23 Apr 2017 20:48:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~394
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a59474c573cdc91102cf9ef343ce0e979fe4dc9d

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

a59474c573cdc91102cf9ef343ce0e979fe4dc9d