Merge branch '3-2-22-3' into 3-2-stable

* 3-2-22-3:
  bumping version
  Include missing module in tag_helper

Author: tenderlove

RAILS_VERSION

@@ -1 +1 @@
-3.2.22.3
+3.2.22.4

actionmailer/lib/action_mailer/version.rb

@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
     TINY  = 22
-    PRE   = "3"
+    PRE   = "4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

actionpack/lib/action_pack/version.rb

@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
     TINY  = 22
-    PRE   = "3"
+    PRE   = "4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

actionpack/lib/action_view/helpers/tag_helper.rb

@@ -10,6 +10,7 @@ module Helpers #:nodoc:
     module TagHelper
       extend ActiveSupport::Concern
       include CaptureHelper
+      include OutputSafetyHelper
 
       BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple checked autobuffer
                            autoplay controls loop selected hidden scoped async

activemodel/lib/active_model/version.rb

@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
     TINY  = 22
-    PRE   = "3"
+    PRE   = "4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

activerecord/lib/active_record/version.rb

@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
     TINY  = 22
-    PRE   = "3"
+    PRE   = "4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

activeresource/lib/active_resource/version.rb

@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
     TINY  = 22
-    PRE   = "3"
+    PRE   = "4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

activesupport/lib/active_support/version.rb

@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
     TINY  = 22
-    PRE   = "3"
+    PRE   = "4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

railties/lib/rails/version.rb

@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
     TINY  = 22
-    PRE   = "3"
+    PRE   = "4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

version.rb

@@ -3,7 +3,7 @@ module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
     TINY  = 22
-    PRE   = "3"
+    PRE   = "4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end