From: Tom Hughes <tom@compton.nu>
Date: Sat, 17 Jan 2015 11:09:13 +0000 (+0000)
Subject: Merge branch 'rails42'
X-Git-Tag: live~4333
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cd2ca12d4235473cd3611b84e2a61649c17da2f6?hp=--cc

Merge branch 'rails42'
---

cd2ca12d4235473cd3611b84e2a61649c17da2f6