From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 18 Jan 2013 21:31:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~649
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/3884eb7ca8e76c1a05afca16fc0cba8312102c64

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

3884eb7ca8e76c1a05afca16fc0cba8312102c64