From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 15 Feb 2015 18:39:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~480
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/86b95a946b6ce73a54defd5ea09c5e4c1303bb43?hp=86b95a946b6ce73a54defd5ea09c5e4c1303bb43

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