From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 9 Oct 2016 21:21:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~409
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/e1a2d9e61e5905bef2ffaa36353681cd33660215

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

e1a2d9e61e5905bef2ffaa36353681cd33660215