From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 7 Jun 2017 21:26:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~382
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ebbd03efe08c33fe81fdcf17e498d1d14546a314?ds=sidebyside

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

ebbd03efe08c33fe81fdcf17e498d1d14546a314