From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Jun 2010 20:19:12 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~6077^2~206
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b9c9d6c1aafdd60c72b54345b4d2dc94317298a0

Merge branch 'master' into openstreetbugs
---

b9c9d6c1aafdd60c72b54345b4d2dc94317298a0