From 6f3f32a0f7df0c9509fd604f6739869a3d954b5b Mon Sep 17 00:00:00 2001
From: Daniel Blaichinger <dblaichinger.mmt-b2009@fh-salzburg.ac.at>
Date: Tue, 8 Feb 2011 16:07:25 +0100
Subject: [PATCH] JSON gem on heroku

---
 Gemfile.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ddccb5c..6e3d3f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,18 +39,18 @@ GEM
     factory_girl_rails (1.0)
       factory_girl (~> 1.3)
       rails (>= 3.0.0.beta4)
-    faker (0.9.4)
+    faker (0.9.5)
       i18n (~> 0.4)
     gravatar_image_tag (1.0.0.pre2)
-    heroku (1.17.8)
-	  json_pure (>= 1.2.0, < 1.5.0)
+    heroku (1.16.2)
+      json_pure (>= 1.2.0, < 1.5.0)
       launchy (~> 0.3.2)
       rest-client (>= 1.4.0, < 1.7.0)
     i18n (0.5.0)
-    json (1.4.6-x86-mingw32)
+    json (1.5.1-x86-mingw32)
     json_pure (1.4.6)
     koala (0.10.0)
-	json (>= 1.0)
+      json (>= 1.0)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
@@ -83,19 +83,19 @@ GEM
     rake (0.8.7)
     rest-client (1.6.1)
       mime-types (>= 1.16)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    rspec-rails (2.4.1)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.4.0)
+      rspec (~> 2.5.0)
     sqlite3-ruby (1.3.2-x86-mingw32)
     thor (0.14.6)
     treetop (1.4.9)