From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 27 Oct 2017 21:01:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~347
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/a8a700e16d286971c43c013b322a1fd4a339de4d

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

a8a700e16d286971c43c013b322a1fd4a339de4d