From: Tom Hughes <tom@compton.nu>
Date: Thu, 31 Dec 2015 07:40:44 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1117'
X-Git-Tag: live~4487
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5f4b7d3f916e132f860ab12c017aba638556abf8?ds=sidebyside;hp=5f4b7d3f916e132f860ab12c017aba638556abf8

Merge remote-tracking branch 'openstreetmap/pull/1117'
---