From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 8 May 2013 18:29:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~613
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f8f896dc142d3923bc7260afe5b94ea538bbd546

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

f8f896dc142d3923bc7260afe5b94ea538bbd546