From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 4 Oct 2016 18:34:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~420
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/84b976f9063129728ca12a5537900bdbf97fafa1?ds=inline;hp=--cc

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

84b976f9063129728ca12a5537900bdbf97fafa1