From a96df04aac00fb2b7d91978c24741100230a50d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 16 Jul 2013 13:00:33 -0300
Subject: Preparing for 3.2.14.rc2 release

---
 actionpack/CHANGELOG.md               | 7 ++++++-
 actionpack/lib/action_pack/version.rb | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index bf697a3800..03803d2898 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,9 @@
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
 
 *   Merge `:action` from routing scope and assign endpoint if both `:controller`
     and `:action` are present. The endpoint assignment only occurs if there is
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 4189730e75..d33d9b60b9 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -3,7 +3,7 @@ module ActionPack
     MAJOR = 3
     MINOR = 2
     TINY  = 14
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-- 
cgit v1.2.3