From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 10 Oct 2016 20:42:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~414
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/248fca51627a8989603344e813bf78e3131de4a8

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

248fca51627a8989603344e813bf78e3131de4a8