From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Aug 2015 20:18:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1043'
X-Git-Tag: live~4041
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d0998f3a63d94200a200194e1925e6a83119cfd4?hp=d0998f3a63d94200a200194e1925e6a83119cfd4

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