From: Sarah Hoffmann Date: Fri, 8 May 2015 18:05:36 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~460 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/bee4fe5b4b497e37c77fc018fbca99f5e56b80cc?hp=--cc Merge remote-tracking branch 'upstream/master' --- bee4fe5b4b497e37c77fc018fbca99f5e56b80cc