From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 27 Feb 2015 19:02:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~479
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1f951e863a870854188603b29c8a98e3897dccdd?hp=1f951e863a870854188603b29c8a98e3897dccdd

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