From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 2 Jan 2017 19:38:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~408
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/19e9748874afa4419d89cc36e12613ad57ee867a

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

19e9748874afa4419d89cc36e12613ad57ee867a