From bc286ff575b400ab796716aae31d69aea8230648 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sat, 18 Feb 2012 10:54:56 -0800
Subject: [PATCH] Update multi_json dependency to version 1.1.0

---
 Gemfile.lock | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0197144..b6e7484 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,7 +91,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     orm_adapter (0.0.6)
     pg (0.13.1)
     polyglot (0.3.3)
@@ -129,10 +129,9 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)