Merge branch 'master' into docrails

1 files changed, 2 insertions, 2 deletions

diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 0182e48425..2703367fdb 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -3,14 +3,14 @@ require "rails"
 
 module ActionMailer
   class Railtie < Rails::Railtie
-    railtie_name :action_mailer
+    config.action_mailer = ActiveSupport::OrderedOptions.new
 
     initializer "action_mailer.url_for", :before => :load_environment_config do |app|
       ActionMailer.base_hook { include app.routes.url_helpers }
     end
 
     require "action_mailer/railties/log_subscriber"
-    log_subscriber ActionMailer::Railties::LogSubscriber.new
+    log_subscriber :action_mailer, ActionMailer::Railties::LogSubscriber.new
 
     initializer "action_mailer.logger" do
       ActionMailer.base_hook { self.logger ||= Rails.logger }