From: Tom Hughes <tom@compton.nu>
Date: Sun, 9 May 2010 16:16:32 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5697^2~213
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0caaf54de5b85070548381a814106a07f366b11a

Merge branch 'master' into openstreetbugs
---

0caaf54de5b85070548381a814106a07f366b11a