From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 28 Feb 2017 20:41:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~401
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/2c6b17f772fec2db0a8a8bac7462efecef92337e

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

2c6b17f772fec2db0a8a8bac7462efecef92337e