From: Tom Hughes <tom@compton.nu>
Date: Sun, 27 Jun 2010 15:29:52 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5117^2~205
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/02ad2f5a5192404185d00ec1b53ae2982760c0ea

Merge branch 'master' into openstreetbugs
---

02ad2f5a5192404185d00ec1b53ae2982760c0ea