From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 1 Mar 2018 22:48:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~343
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/12168e3ca9421ab1d0195507919c26ce029ce155

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

12168e3ca9421ab1d0195507919c26ce029ce155