From c167810aef1f900395f4d0611c950385f5e4c70f Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Wed, 14 Mar 2012 17:16:13 -0700
Subject: [PATCH] also update em-http-request :/

---
 Gemfile.lock | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 287e65f87..4411c3e13 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,6 +117,7 @@ GEM
     chronic (0.6.7)
     client_side_validations (3.1.4)
     columnize (0.3.6)
+    cookiejar (0.3.0)
     crack (0.3.1)
     cucumber (1.1.9)
       builder (>= 2.1.2)
@@ -141,15 +142,18 @@ GEM
       devise (~> 1.3.1)
       rails (>= 3.0.0, <= 3.2)
     diff-lcs (1.1.3)
-    em-http-request (0.3.0)
-      addressable (>= 2.0.0)
-      escape_utils
-      eventmachine (>= 0.12.9)
+    em-http-request (1.0.2)
+      addressable (>= 2.2.3)
+      cookiejar
+      em-socksify
+      eventmachine (>= 1.0.0.beta.4)
+      http_parser.rb (>= 0.5.3)
+    em-socksify (0.1.0)
+      eventmachine
     em-synchrony (1.0.0)
       eventmachine (>= 1.0.0.beta.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    escape_utils (0.2.4)
     eventmachine (1.0.0.beta.4)
     excon (0.9.6)
     factory_girl (2.6.3)
@@ -205,6 +209,7 @@ GEM
     highline (1.6.11)
     hodel_3000_compliant_logger (0.1.0)
     http_accept_language (1.0.2)
+    http_parser.rb (0.5.3)
     i18n (0.5.0)
     i18n-inflector (2.6.3)
       i18n (>= 0.4.1)