From 8f482da5dbce3cda11175c18779114b844ed1d63 Mon Sep 17 00:00:00 2001
From: Scott Davis <jetviper21@gmail.com>
Date: Tue, 26 Jul 2011 02:30:47 -0400
Subject: [PATCH] merge

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c2b5e59e..6156cca1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    compass (0.12.0.alpha.0.7a18375)
+    compass (0.12.0.alpha.0.c79e997)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)