From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 23 Sep 2013 19:55:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~574
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c371bbcfe45904ab56ece73f709b75e5ef6502fd

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

c371bbcfe45904ab56ece73f709b75e5ef6502fd