merge 19364:19600 of rails_port into the openID branch
authorKai Krueger <kakrueger@gmail.com>
Sat, 23 Jan 2010 15:31:01 +0000 (15:31 +0000)
committerKai Krueger <kakrueger@gmail.com>
Sat, 23 Jan 2010 15:31:01 +0000 (15:31 +0000)
commit84db1d66b7d819a4a777d2b9e5909cffe82c514e
treea23613c796e6678545582dbc947c385e1786df08
parent45f12aa99e9f9634b5494c9f56a5a92168c62305
parentc07279e4585ad8cdc859eea61a9193aa849e7e32
merge 19364:19600 of rails_port into the openID branch

renamed migration 049_add_open_id_authentication_tables.rb to
050_add_open_id_authentication_tables.rb
app/controllers/user_controller.rb
config/environment.rb
config/locales/en.yml
db/migrate/050_add_open_id_authentication_tables.rb