From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 11 Jun 2017 07:27:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~380
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/cb908b0a30bbffb3a35f49aa13e249cf3b61b152?ds=sidebyside;hp=--cc

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

cb908b0a30bbffb3a35f49aa13e249cf3b61b152