Merge branch 'master' into normalizecb

* master:
  private callback methods should work
  Update mail to minimum version 2.5.4

actionmailer/actionmailer.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'actionpack', version
 
-  s.add_dependency 'mail', '~> 2.5.3'
+  s.add_dependency 'mail', '~> 2.5.4'
 end

activesupport/test/callbacks_test.rb

@@ -864,8 +864,9 @@ module CallbacksTest
         include ActiveSupport::Callbacks
         define_callbacks :foo, :scope => [:name]
         set_callback :foo, :before, :foo, :if => callback
-        def foo; end
         def run; run_callbacks :foo; end
+        private
+        def foo; end
       }
       object = klass.new
       object.run