From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 20 Mar 2017 19:42:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~399
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/4351c76f6dec7d791e21c458a6afd46fb06cd8fe?hp=-c

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

4351c76f6dec7d791e21c458a6afd46fb06cd8fe