From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 29 Sep 2017 17:44:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~367
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/2e6f5ba7e68d52aff93775ebffcdb5c59f7f65df

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

2e6f5ba7e68d52aff93775ebffcdb5c59f7f65df