From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 30 Sep 2017 07:41:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~371
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a796edb9ced6d46c7edf9a8a7d1ccad3564da004

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

a796edb9ced6d46c7edf9a8a7d1ccad3564da004