From 63969bc3f847b6674f93b94066ce4e494c8fe1bd Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Thu, 31 May 2012 17:54:57 -1000
Subject: [PATCH] Update rails dependency to version 3.2.5

---
 Gemfile.lock | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 44827b7..68434b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    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)
@@ -14,18 +14,18 @@ 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)
-    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)
     addressable (2.2.8)
@@ -92,14 +92,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_admin (0.0.3)
       bbenezech-nested_form (~> 0.0.6)
       bootstrap-sass (~> 2.0)
@@ -113,9 +113,9 @@ GEM
       rails (~> 3.1)
       remotipart (~> 1.0)
       sass-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)