From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 29 Aug 2015 10:16:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~436
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f6b5565db6ed86f353c483f4f5b61a3abaa497d9

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

f6b5565db6ed86f353c483f4f5b61a3abaa497d9