Merge branch 'openID' of git://git.openstreetmap.org/rails into openid
authorTom Hughes <tom@compton.nu>
Sat, 21 May 2011 11:11:40 +0000 (12:11 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 21 May 2011 11:11:40 +0000 (12:11 +0100)

Trivial merge