From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 13 Feb 2014 19:52:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~553
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1187929a02ee62ae154f0faed14a5ad853f0674f

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

1187929a02ee62ae154f0faed14a5ad853f0674f