From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 May 2010 12:37:05 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6296
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/56aefb8dcd86aca391285abf84eb53f3e3e03572?hp=155ed85bf5b90fc0419289354904a3f9945dda3f

Merge branch 'master' into openid
---