From: Tom Hughes <tom@compton.nu>
Date: Fri, 29 Apr 2011 16:05:59 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5091^2~184^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/af68e07272f2f42a581b435dc0563fe8a862a562?hp=-c

Merge branch 'master' into openstreetbugs
---

af68e07272f2f42a581b435dc0563fe8a862a562