From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 2 Nov 2016 18:22:50 +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/a9c06d89c144fb90616e3a780029fe3d9bcfd90d

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

a9c06d89c144fb90616e3a780029fe3d9bcfd90d