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, 7 insertions, 1 deletions

diff --git a/activeresource/lib/active_resource/railtie.rb b/activeresource/lib/active_resource/railtie.rb
index 1b9307d472..7e35fdc0eb 100644
--- a/activeresource/lib/active_resource/railtie.rb
+++ b/activeresource/lib/active_resource/railtie.rb
@@ -3,9 +3,15 @@ require "rails"
 
 module ActiveResource
   class Railtie < Rails::Railtie
-    plugin_name :active_resource
+    railtie_name :active_resource
 
     require "active_resource/railties/subscriber"
     subscriber ActiveResource::Railties::Subscriber.new
+
+    initializer "active_resource.set_configs" do |app|
+      app.config.active_resource.each do |k,v|
+        ActiveResource::Base.send "#{k}=", v
+      end
+    end
   end
 end
\ No newline at end of file