From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 7 Feb 2014 19:20:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~559
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/002c94211724e5c47471ff2475b7226f3c87b353

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

002c94211724e5c47471ff2475b7226f3c87b353