From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 27 Feb 2017 21:30:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~402
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/8bc3bb16a116f0152b49b00dff53fb1f37f0fb31?hp=8bc3bb16a116f0152b49b00dff53fb1f37f0fb31

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