From b3f18e1961c4ddd1c861c89ea0fd8da7571f9746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:26:28 +0200
Subject: [PATCH] bump typhoeus

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index e5c4e805b..b6a5721ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,7 @@ gem 'acts-as-taggable-on', '3.3.0'
 gem 'addressable',        '2.3.6', :require => 'addressable/uri'
 gem 'faraday',            '0.8.9'
 gem 'faraday_middleware', '0.9.0'
-gem 'typhoeus',           '0.6.8'
+gem 'typhoeus',           '0.6.9'
 
 # Views
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 88711605c..4e43e800c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -457,8 +457,8 @@ GEM
       faraday (~> 0.8, < 0.10)
       multi_json (~> 1.0)
       simple_oauth (~> 0.2)
-    typhoeus (0.6.8)
-      ethon (>= 0.7.0)
+    typhoeus (0.6.9)
+      ethon (>= 0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.0)
@@ -568,7 +568,7 @@ DEPENDENCIES
   test_after_commit (= 0.2.5)
   timecop (= 0.7.1)
   twitter (= 4.8.1)
-  typhoeus (= 0.6.8)
+  typhoeus (= 0.6.9)
   uglifier (= 2.5.0)
   unicorn (= 4.8.3)
   uuid (= 2.3.7)