From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 9 Jun 2017 19:54:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~374
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/c504ec523cd815d920528bcdc9b915a83f2fd64a

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

c504ec523cd815d920528bcdc9b915a83f2fd64a