From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 6 May 2015 19:28:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~461
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/357a99c0ef86cd4d3276c7dd215b58f78640515a

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

357a99c0ef86cd4d3276c7dd215b58f78640515a