Merge branch 'rails'

Conflicts:
	actionmailer/lib/action_mailer.rb
	actionmailer/lib/action_mailer/delivery_method/smtp.rb

1 files changed, 32 insertions, 1 deletions

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 0478ae4ebc..9e21b3faf3 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -34,7 +34,38 @@ module ActiveSupport
   end
 end
 
-require 'active_support/autoload'
+require "active_support/dependencies/autoload"
+
+module ActiveSupport
+  extend ActiveSupport::Autoload
+
+  autoload :BacktraceCleaner
+  autoload :Base64
+  autoload :BasicObject
+  autoload :Benchmarkable
+  autoload :BufferedLogger
+  autoload :Cache
+  autoload :Callbacks
+  autoload :Concern
+  autoload :Configurable
+  autoload :DeprecatedCallbacks
+  autoload :Deprecation
+  autoload :Gzip
+  autoload :Inflector
+  autoload :Memoizable
+  autoload :MessageEncryptor
+  autoload :MessageVerifier
+  autoload :Multibyte
+  autoload :OptionMerger
+  autoload :OrderedHash
+  autoload :OrderedOptions
+  autoload :Notifications
+  autoload :Rescuable
+  autoload :SecureRandom
+  autoload :StringInquirer
+  autoload :XmlMini
+end
+
 require 'active_support/vendor'
 
 require 'i18n'