From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 4 Feb 2015 19:42:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~483
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a16075d34895a947bbcbf60f22dc81df92cf4640

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

a16075d34895a947bbcbf60f22dc81df92cf4640