From 4db207b3dd71c99bb15e1df7370f1b87ecb1a853 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Thu, 31 May 2012 22:14:32 -0700
Subject: [PATCH] update to 3.2.5

---
 Gemfile      |  2 +-
 Gemfile.lock | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Gemfile b/Gemfile
index eaec4680d..fea06ccd8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'bundler', '> 1.1.0'
 ruby '1.9.3' if ENV['HEROKU']
 
-gem 'rails', '3.2.4'
+gem 'rails', '3.2.5'
 
 gem 'foreman', '0.41'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 73b4d13b0..94d3b17e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,12 +41,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.4)
-      actionpack (= 3.2.4)
+    actionmailer (3.2.5)
+      actionpack (= 3.2.5)
       mail (~> 2.4.4)
-    actionpack (3.2.4)
-      activemodel (= 3.2.4)
-      activesupport (= 3.2.4)
+    actionpack (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
@@ -54,21 +54,21 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.4)
-      activesupport (= 3.2.4)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
-    activerecord (3.2.4)
-      activemodel (= 3.2.4)
-      activesupport (= 3.2.4)
+    activerecord (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-import (0.2.9)
       activerecord (~> 3.0)
       activerecord (~> 3.0)
-    activeresource (3.2.4)
-      activemodel (= 3.2.4)
-      activesupport (= 3.2.4)
-    activesupport (3.2.4)
+    activeresource (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+    activesupport (3.2.5)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts_as_api (0.4)
@@ -314,14 +314,14 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.4)
-      actionmailer (= 3.2.4)
-      actionpack (= 3.2.4)
-      activerecord (= 3.2.4)
-      activeresource (= 3.2.4)
-      activesupport (= 3.2.4)
+    rails (3.2.5)
+      actionmailer (= 3.2.5)
+      actionpack (= 3.2.5)
+      activerecord (= 3.2.5)
+      activeresource (= 3.2.5)
+      activesupport (= 3.2.5)
       bundler (~> 1.0)
-      railties (= 3.2.4)
+      railties (= 3.2.5)
     rails-i18n (0.6.4)
       i18n (~> 0.5)
     rails_admin (0.0.3)
@@ -339,9 +339,9 @@ GEM
       sass-rails (~> 3.1)
     rails_autolink (1.0.7)
       rails (~> 3.1)
-    railties (3.2.4)
-      actionpack (= 3.2.4)
-      activesupport (= 3.2.4)
+    railties (3.2.5)
+      actionpack (= 3.2.5)
+      activesupport (= 3.2.5)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -514,7 +514,7 @@ DEPENDENCIES
   rack-piwik
   rack-rewrite (~> 1.2.1)
   rack-ssl
-  rails (= 3.2.4)
+  rails (= 3.2.5)
   rails-i18n
   rails_admin (~> 0.0.3)
   rails_autolink