From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 20 Feb 2014 18:52:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~546
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/e33928bbf031720bab699c8acfa401b3ced7c02b

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

e33928bbf031720bab699c8acfa401b3ced7c02b