Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Fri, 10 Jun 2011 18:11:08 +0000 (19:11 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 10 Jun 2011 18:11:08 +0000 (19:11 +0100)
commitce7b651eb25473b74765ccb349f37ebd4ea6edfe
tree00b09142f54d5c555c66adb7b0fec4b1b9dc3826
parent652dbf5044d3f7fdb5f7af1b7e8393c2a79246c6
parent85e99d3127e5febcf4698c9d2576f653775af787
Merge branch 'master' into openid
app/controllers/user_controller.rb
app/models/user.rb
app/views/user/login.html.erb
config/locales/en.yml