From 80daa058173e1f534f4670b31b78a02140a976be Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Thu, 31 May 2012 23:10:34 -0700
Subject: [PATCH] update haml to get rid if weird escape_javascript bug

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

diff --git a/Gemfile b/Gemfile
index fea06ccd8..a44bdf4ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,7 @@ gem 'typhoeus'
 
 # views
 
-gem 'haml'
+gem 'haml', '3.1.6.rc.1'
 gem 'mobile-fu'
 
 gem 'will_paginate'
diff --git a/Gemfile.lock b/Gemfile.lock
index 94d3b17e6..870468fc7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
     guard-spork (0.8.0)
       guard (>= 0.10.0)
       spork (>= 0.8.4)
-    haml (3.1.5)
+    haml (3.1.6.rc.1)
     handlebars_assets (0.4.4)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
@@ -486,7 +486,7 @@ DEPENDENCIES
   guard-cucumber
   guard-rspec
   guard-spork
-  haml
+  haml (= 3.1.6.rc.1)
   handlebars_assets
   heroku
   heroku_san (= 3.0.1)