From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Aug 2015 20:30:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1040'
X-Git-Tag: live~4016
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/db7374f2bbdd0b3ee0f3cb0a9cca84f9c72cffb5

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

db7374f2bbdd0b3ee0f3cb0a9cca84f9c72cffb5