From aadbd952152422a93bef5a5356cdf3cfd26308d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 25 Jan 2013 13:23:54 +0100
Subject: [PATCH] Markerb got a release so we can get rid of another gem pulled
 from git \o/

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

diff --git a/Gemfile b/Gemfile
index 710d99d52..7ecdf1375 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'twitter', '4.4.4'
 
 # mail
 
-gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
+gem 'markerb', '1.0.1'
 gem 'messagebus_ruby_api', '1.0.3'
 
 group :production do # we don't install these on travis to speed up test runs
diff --git a/Gemfile.lock b/Gemfile.lock
index c08890f2c..ee7863b3f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,13 +7,6 @@ GIT
       activesupport (>= 2.3.0)
       nokogiri (>= 1.3.3)
 
-GIT
-  remote: https://github.com/plataformatec/markerb.git
-  revision: 93b1e8bea9b8fa89ef930f78ba562f596c022198
-  specs:
-    markerb (1.0.0)
-      redcarpet (>= 2.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -214,6 +207,8 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    markerb (1.0.1)
+      redcarpet (>= 2.0)
     messagebus_ruby_api (1.0.3)
     method_source (0.8.1)
     mime-types (1.19)
@@ -449,7 +444,7 @@ DEPENDENCIES
   jasmine (= 1.3.1)
   jquery-rails (= 2.1.4)
   json (= 1.7.5)
-  markerb!
+  markerb (= 1.0.1)
   messagebus_ruby_api (= 1.0.3)
   mini_magick (= 3.4)
   mobile-fu (= 1.1.1)