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

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

dca0be1886d9b9fcd2cab1b7c82ac4132fbf722b