From b5e3fced3793a73a4af644b893af3eac047ac01b Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Tue, 19 Jul 2011 09:45:41 -0700
Subject: [PATCH] Update hike dependency to version 1.2.0

---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c03747f..389b0dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,7 +53,7 @@ GEM
       multi_json (~> 1.0)
     geokit (1.6.0)
     haml (3.2.0.alpha.8)
-    hike (1.1.0)
+    hike (1.2.0)
     i18n (0.6.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
@@ -99,7 +99,7 @@ GEM
     sprockets (2.0.0.beta.10)
       hike (~> 1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.3)
     therubyracer (0.9.2)
       libv8 (~> 3.3.10)
@@ -117,7 +117,7 @@ GEM
     warden (1.0.4)
       rack (>= 1.0)
     webmock (1.6.4)
-      addressable (~> 2.2, > 2.2.5)
+      addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
 
 PLATFORMS