From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Jun 2011 21:36:43 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5096^2~144
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7c98b41cc89068d049a18f8738276f19cd47095e

Merge branch 'master' into openstreetbugs
---

7c98b41cc89068d049a18f8738276f19cd47095e