merge 19889:20181 of rails_port into the openID branch
authorKai Krueger <kakrueger@gmail.com>
Sat, 27 Feb 2010 11:21:15 +0000 (11:21 +0000)
committerKai Krueger <kakrueger@gmail.com>
Sat, 27 Feb 2010 11:21:15 +0000 (11:21 +0000)
commitbbf30e76e4bfcd70e62fc84ecd32c5e494506e9e
treef5345059bc4ef079cde75bdb99705dc4a9832443
parent17a7c69e8dfefb5dda2a9f57d6ea3c879d4568f4
parent1df4234c72c9a8b6f4c996c7019ea8f10145dc87
merge 19889:20181 of rails_port into the openID branch

merge conflicts with the remember_me functionality
app/controllers/user_controller.rb
app/models/user.rb
app/views/user/account.html.erb
app/views/user/login.html.erb
config/locales/en.yml