From: Tom Hughes <tom@compton.nu>
Date: Fri, 14 May 2010 21:50:38 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5725^2~210
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/273706ae09862364deaa0287a3b563340300fdea

Merge branch 'master' into openstreetbugs
---

273706ae09862364deaa0287a3b563340300fdea