From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 28 Apr 2014 18:19:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~540
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/163b488591181e05a1ca0f80923ff7d5d309c71b

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

163b488591181e05a1ca0f80923ff7d5d309c71b