From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 17 Aug 2014 20:41:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~523
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c6590bbd84e9bd5589b249af258c506c85d73a23

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

c6590bbd84e9bd5589b249af258c506c85d73a23