From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 18 Apr 2017 20:45:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~396
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/9d74ccf33fd6c442dcfe673169cdd046cfbe40c3

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

9d74ccf33fd6c442dcfe673169cdd046cfbe40c3