From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 18 Feb 2017 12:54:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~403
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/8c3796826b9c3e35bba0b31f9de3ca22d2577870

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

8c3796826b9c3e35bba0b31f9de3ca22d2577870