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

diff --cc app/controllers/user_controller.rb
index 3a4b009202b0138618a6ff879a3182078ec7c6b9,ca004676219f52b0fccc0c73267b83a2093ee7a1..f9bbd5dd5be7c9fbeeb97c5b73bd03e2c06e7185
--- 1/app/controllers/user_controller.rb
--- 2/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@@ -15,7 -15,9 +15,9 @@@ class UserController < ApplicationContr
    before_filter :lookup_this_user, :only => [:activate, :deactivate, :hide, :unhide, :delete]
  
    filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 -
 +  
+   cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
+ 
    def save
      @title = t 'user.new.title'
  

diff --cc config/environment.rb
index da71cc57230d20fbefef4f323f5a077ac0ea1a95,ba5241a21fc47a1d3a03c60a9fcab341585e5dac..70a1ddbd5ac04cd52ce30899a247d24b0d7e1172
--- 1/config/environment.rb
--- 2/config/environment.rb
+++ b/config/environment.rb
@@@ -52,9 -52,9 +52,10 @@@ Rails::Initializer.run do |config
    config.gem 'rmagick', :lib => 'RMagick'
    config.gem 'oauth', :version => '>= 0.3.6'
    config.gem 'httpclient'
 +  config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4'
+   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
  
-   # Only load the plugins named here, in the order given. By default, all plugins 
+   # Only load the plugins named here, in the order given. By default, all plugins
    # in vendor/plugins are loaded in alphabetical order.
    # :all can be used as a placeholder for all plugins not explicitly named
    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]

diff --cc config/locales/en.yml
Simple merge

diff --cc db/migrate/050_add_open_id_authentication_tables.rb
index 7dfff209df19b5f8fea6192e04121e1b083b34d1,0000000000000000000000000000000000000000..7dfff209df19b5f8fea6192e04121e1b083b34d1
mode 100644,000000..100644
--- 1/db/migrate/049_add_open_id_authentication_tables.rb
--- /dev/null
+++ b/db/migrate/050_add_open_id_authentication_tables.rb