From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 23 Aug 2014 20:25:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~522
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c03ae560e33b17f8623578c572a7b096c2311008

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

c03ae560e33b17f8623578c572a7b096c2311008