From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 15 Jan 2017 20:39:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~406
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/78d5b63e38b1165a22f27a5255e0c0d63d6464cb

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

78d5b63e38b1165a22f27a5255e0c0d63d6464cb