From: Sarah Hoffmann Date: Wed, 12 Oct 2016 20:28:48 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~413 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/756c23f39fcfa5d5a20ba587460f59cf2840e537?hp=--cc Merge remote-tracking branch 'upstream/master' --- 756c23f39fcfa5d5a20ba587460f59cf2840e537