From: Tom Hughes <tom@compton.nu>
Date: Wed, 19 Oct 2016 10:52:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1330'
X-Git-Tag: live~3752
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d058f3ef28d498b117c8d32c54d5e61778259bca?hp=23c3168c55a2be7fd0176e235c12d8338d6b0a17

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