From d9b63b26ea51d0959bec63a7007ad6c07b96da99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sat, 25 May 2013 15:18:17 +0200
Subject: [PATCH] bump mini_magick

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

diff --git a/Gemfile b/Gemfile
index c74f2d132..99e4768f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ gem 'foreigner',           '1.4.1'
 
 gem 'carrierwave', '0.8.0'
 gem 'fog',         '1.12.1'
-gem 'mini_magick', '3.5'
+gem 'mini_magick', '3.6.0'
 gem 'remotipart',  '1.0.5'
 
 # Localization
diff --git a/Gemfile.lock b/Gemfile.lock
index 01327f4fc..3e62b5631 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,7 +209,7 @@ GEM
     messagebus_ruby_api (1.0.3)
     method_source (0.8.1)
     mime-types (1.23)
-    mini_magick (3.5.0)
+    mini_magick (3.6.0)
       subexec (~> 0.2.1)
     mobile-fu (1.1.1)
       rack-mobile-detect
@@ -448,7 +448,7 @@ DEPENDENCIES
   json (= 1.7.7)
   markerb (= 1.0.1)
   messagebus_ruby_api (= 1.0.3)
-  mini_magick (= 3.5)
+  mini_magick (= 3.6.0)
   mobile-fu (= 1.1.1)
   mysql2 (= 0.3.11)
   nokogiri (= 1.5.9)