Merge branch 'master' of git://github.com/rails/rails

Conflicts:
	actionmailer/lib/action_mailer/mail_helper.rb
	railties/lib/rails/configuration.rb

1 files changed, 1 insertions, 7 deletions

diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index b05d21ae5d..fbbcf98854 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -3,7 +3,7 @@ require "rails"
 
 module ActionMailer
   class Railtie < Rails::Railtie
-    plugin_name :action_mailer
+    railtie_name :action_mailer
 
     require "action_mailer/railties/subscriber"
     subscriber ActionMailer::Railties::Subscriber.new
@@ -18,11 +18,5 @@ module ActionMailer
     initializer "action_mailer.logger" do
       ActionMailer::Base.logger ||= Rails.logger
     end
-
-    initializer "action_mailer.view_paths" do |app|
-      # TODO: this should be combined with the logic for default config.action_mailer.view_paths
-      view_path = ActionView::PathSet.type_cast(app.config.view_path, app.config.cache_classes)
-      ActionMailer::Base.template_root = view_path if ActionMailer::Base.view_paths.blank?
-    end
   end
 end
\ No newline at end of file