From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 May 2010 11:13:19 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5655^2~209
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b5d0de88eab8b22bedec7fd7cc34552caa1584ab?hp=-c

Merge branch 'master' into openstreetbugs
---

b5d0de88eab8b22bedec7fd7cc34552caa1584ab