From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 6 Jul 2014 21:00:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~527
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b955883a5bff28acbc6c5c62254cf6d479d8c111

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

b955883a5bff28acbc6c5c62254cf6d479d8c111