From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 17 Feb 2013 13:58:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~630
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/ccdce35322a605e6665adbb32a804ef7476ac6fd

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

ccdce35322a605e6665adbb32a804ef7476ac6fd