From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 27 Jun 2015 10:19:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~448
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/54126633f6078ebb86b53c614fcb243039e839fb

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

54126633f6078ebb86b53c614fcb243039e839fb