From fb909fcb4893b33b5fe66dbf631df466aaabc08d Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Mon, 27 Aug 2012 10:48:41 -0700
Subject: [PATCH] this seemed to break things :(

---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3052ad0b1..124aefa72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -441,7 +441,8 @@ GEM
       multi_json (~> 1.0)
       simple_oauth (~> 0.1)
     typhoeus (0.4.2)
-      mime-types
+      ffi (~> 1.0)
+      mime-types (~> 1.18)
     tzinfo (0.3.33)
     uglifier (1.2.4)
       execjs (>= 0.3.0)