From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 29 Oct 2014 20:03:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~506
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/59540972b64aff5351e4fc8654d5c1100c88dfc6

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

59540972b64aff5351e4fc8654d5c1100c88dfc6