From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 9 Apr 2017 21:16:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~398
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6c12fc971e0e6141572ad50adf79533b4fc87d1a

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

6c12fc971e0e6141572ad50adf79533b4fc87d1a