From: Tom Hughes <tom@compton.nu>
Date: Tue, 31 May 2011 18:20:42 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~6077^2~145
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c20b31b54ed3043e9ebf3964aa7c08f5ddc73a95?hp=c20b31b54ed3043e9ebf3964aa7c08f5ddc73a95

Merge branch 'master' into openstreetbugs
---