From: Tom Hughes <tom@compton.nu>
Date: Sat, 21 May 2011 13:05:55 +0000 (+0100)
Subject: Cleanup merge breakage
X-Git-Tag: live~6283
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4e38994d1b287300d6ebd5a34583ade657fb3149?hp=4e38994d1b287300d6ebd5a34583ade657fb3149

Cleanup merge breakage
---