From: Sarah Hoffmann Date: Sat, 18 Apr 2015 16:40:31 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~467 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/158628553f39cf4508a54021af71bc4836e893e8?hp=--cc Merge remote-tracking branch 'upstream/master' --- 158628553f39cf4508a54021af71bc4836e893e8