From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 3 Jan 2013 21:13:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~645
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/bcbba1cb5a4e5a1df3b8f5c79e2a988221adf867

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

bcbba1cb5a4e5a1df3b8f5c79e2a988221adf867