From df3438a53e1e23592496caea3c5b6c50cebaab91 Mon Sep 17 00:00:00 2001
From: Stef Lewandowski <stef@stef.io>
Date: Mon, 5 Nov 2012 08:37:11 +0000
Subject: [PATCH] gemfile maruku fix

---
 Gemfile      |  1 +
 Gemfile.lock | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index bda6f95..66dbaa8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
 source :rubygems
 ruby '1.9.3'
+gem 'maruku', :git =>"git://github.com/stefl/maruku.git"
 gem 'rake'
 gem 'sinatra-flash', :require => 'sinatra/flash'
 gem 'haml'
diff --git a/Gemfile.lock b/Gemfile.lock
index fa314d7..1ea19e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,6 +10,13 @@ GIT
       liquid (~> 2.3)
       maruku (~> 0.5)
 
+GIT
+  remote: git://github.com/stefl/maruku.git
+  revision: de2cb76356b8831786a6bdb8c46f95273f2f30f5
+  specs:
+    maruku (0.6.0)
+      nokogiri (~> 1.5)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -72,8 +79,6 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
     mime-types (1.18)
     mongoid (3.0.3)
       activemodel (~> 3.1)
@@ -84,6 +89,7 @@ GEM
     multi_json (1.3.4)
     multipart-post (1.1.5)
     netrc (0.7.7)
+    nokogiri (1.5.5)
     oauth (0.4.6)
     origin (1.0.6)
     padrino (0.10.5)
@@ -147,7 +153,6 @@ GEM
     susy (1.0.rc.0)
       compass (>= 0.12.2.rc.0)
       sass (>= 3.2.0.alpha.237)
-    syntax (1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -179,6 +184,7 @@ DEPENDENCIES
   hashie
   hirefire
   jekyll!
+  maruku!
   mongoid
   padrino (= 0.10.5)
   rake