From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 24 May 2013 21:38:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~608
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/4b08a08968c0317c38960ad6d8e2ef4099933fe6

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

4b08a08968c0317c38960ad6d8e2ef4099933fe6