From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 May 2011 21:56:47 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5120^2~181
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e7cd90f4b4d431b32a92ca68c3df817e8e765d09

Merge branch 'master' into openstreetbugs
---

e7cd90f4b4d431b32a92ca68c3df817e8e765d09