From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 2 Oct 2016 12:23:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~421
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/35df2bb75eae78f38b347f26862fa4cb8284d574

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

35df2bb75eae78f38b347f26862fa4cb8284d574