From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 13 Apr 2017 20:26:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~397
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/6867b240d5d23c22ae04c57d65881d54d793da73?hp=6867b240d5d23c22ae04c57d65881d54d793da73

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