From: Tom Hughes <tom@compton.nu>
Date: Wed, 24 Aug 2011 20:25:05 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5616^2~132
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/18883b59c88940b9bd323756e60603302f185dfd

Merge branch 'master' into openstreetbugs
---

18883b59c88940b9bd323756e60603302f185dfd