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

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

8cab47785d6167228649e3fe92cf84fb582de059