From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 23 Apr 2017 11:35:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~395
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a83424fee50c6837bcadad44ae374de98e4bb1f1?ds=inline;hp=--cc

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

a83424fee50c6837bcadad44ae374de98e4bb1f1