From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 5 Jun 2017 18:27:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~378
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/5141ac14f6c8502aee8a88074159a68222054527

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

5141ac14f6c8502aee8a88074159a68222054527