From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 20 Jan 2015 21:08:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~490
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ccaf7fa47fc7b02927ca4fe0f717e9e5b725ab9d?ds=sidebyside

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

ccaf7fa47fc7b02927ca4fe0f717e9e5b725ab9d