From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 9 Feb 2013 19:15:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~639
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f040d62402698480c18038f20374eaf687a08759

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

f040d62402698480c18038f20374eaf687a08759