From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 4 May 2015 19:24:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~462
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1d9b1fcd99e05f2222306d53256faff024c4ed96

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

1d9b1fcd99e05f2222306d53256faff024c4ed96