From 780bba8044c84fb07c5dececec9544f1ea9392db Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Mon, 11 Jul 2011 10:11:07 -0700
Subject: [PATCH] Update haml dependency to version 3.2.0.alpha

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

diff --git a/Gemfile b/Gemfile
index dbfeb25..1c79365 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '3.1.0.rc4'
 gem 'coffee-script'
 gem 'devise'
 gem 'geokit'
-gem 'haml'
+gem 'haml', '~> 3.2.0.alpha'
 gem 'therubyracer', :platforms => :ruby
 gem 'uglifier'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2756320..f154d5e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
     execjs (1.2.0)
       multi_json (~> 1.0)
     geokit (1.6.0)
-    haml (3.1.2)
+    haml (3.2.0.alpha.8)
     hike (1.1.0)
     i18n (0.6.0)
     jruby-openssl (0.7.4)
@@ -99,7 +99,7 @@ GEM
     sprockets (2.0.0.beta.10)
       hike (~> 1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.3)
     therubyracer (0.9.2)
       libv8 (~> 3.3.10)
@@ -129,7 +129,7 @@ DEPENDENCIES
   coffee-script
   devise
   geokit
-  haml
+  haml (~> 3.2.0.alpha)
   jruby-openssl
   pg
   rails (= 3.1.0.rc4)