From 4c2ca4f8fc422949f5191a178550b5857e31fe24 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Mon, 23 May 2011 02:08:22 -0700
Subject: [PATCH] Update multi_json dependency to version 1.0.3

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 8fe8fea..e27ecef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    multi_json (1.0.2)
+    multi_json (1.0.3)
     orm_adapter (0.0.5)
     pg (0.11.0)
     polyglot (0.3.1)
@@ -90,7 +90,7 @@ GEM
     sprockets (2.0.0.beta.8)
       hike (~> 1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.3)
     therubyracer-heroku (0.8.1.pre3)
     therubyrhino (1.72.7)