From: Tom Hughes <tom@compton.nu>
Date: Sat, 23 Oct 2010 11:00:40 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6283
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/58653f8b9d90c9f0a2f44d026b0ec84574f6bc9a?hp=--cc

Merge branch 'master' into openid
---

58653f8b9d90c9f0a2f44d026b0ec84574f6bc9a