From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 15 Oct 2013 19:12:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~569
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/3d965df4c23e5dbd0954f5ec0747851de361313a?ds=sidebyside

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

3d965df4c23e5dbd0954f5ec0747851de361313a