From: Tom Hughes <tom@compton.nu>
Date: Sun, 18 Sep 2011 13:26:59 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5616^2~129
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3a654c89197b40f4a623c0dd33b87b415623d97d

Merge branch 'master' into openstreetbugs
---

3a654c89197b40f4a623c0dd33b87b415623d97d