From caafd963a30ec3c0419c10a314151e622c37fbba Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Mon, 6 Dec 2010 13:52:35 -0800
Subject: [PATCH] sort out some bundle issues

---
 doc-src/Gemfile      |  4 ++--
 doc-src/Gemfile.lock | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/doc-src/Gemfile b/doc-src/Gemfile
index b9cebae0..128735d9 100644
--- a/doc-src/Gemfile
+++ b/doc-src/Gemfile
@@ -5,11 +5,11 @@ gem 'rdiscount'
 gem 'thor'
 gem 'rack'
 gem 'mime-types'
-gem 'fssm'
 gem 'serve', "1.0.0"
 gem 'nokogiri'
 gem 'coderay'
-gem 'sass', ">= 3.1.0.alpha.50"
+gem 'sass', ">= 3.1.0.alpha.50", :git => "git://github.com/chriseppstein/sass.git"
+gem 'fssm', '0.1.2'
 gem 'haml', ">= 3.1.0.alpha.36"
 gem 'rake'
 gem 'compass', :path => ".."
diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock
index fe03be3f..ba0d4c59 100644
--- a/doc-src/Gemfile.lock
+++ b/doc-src/Gemfile.lock
@@ -5,10 +5,16 @@ GIT
     nanoc3 (3.2.0a3)
       cri (>= 1.0.0)
 
+GIT
+  remote: git://github.com/chriseppstein/sass.git
+  revision: c9de58c678644ec9b0ae5103ab595815e5aa4ecf
+  specs:
+    sass (3.1.0.alpha.50)
+
 PATH
   remote: ..
   specs:
-    compass (0.11.alpha.3.04fb6df)
+    compass (0.11.alpha.3.d0c39f9)
       chunky_png (~> 0.10.3)
       sass (>= 3.1.0.alpha.50)
 
@@ -23,7 +29,7 @@ GEM
     cri (1.0.1)
     css-slideshow (0.2.0)
       compass (>= 0.10.0.rc3)
-    fssm (0.2.0)
+    fssm (0.1.2)
     haml (3.1.0.alpha.36)
     i18n (0.4.2)
     json (1.4.6)
@@ -32,7 +38,6 @@ GEM
     rack (1.2.1)
     rake (0.8.7)
     rdiscount (1.6.5)
-    sass (3.1.0.alpha.50)
     serve (1.0.0)
       activesupport (~> 3.0.1)
       i18n (~> 0.4.1)
@@ -49,7 +54,7 @@ DEPENDENCIES
   compass!
   compass-susy-plugin (>= 0.7.0.pre8)
   css-slideshow (= 0.2.0)
-  fssm
+  fssm (= 0.1.2)
   haml (>= 3.1.0.alpha.36)
   json
   mime-types
@@ -58,6 +63,6 @@ DEPENDENCIES
   rack
   rake
   rdiscount
-  sass (>= 3.1.0.alpha.50)
+  sass (>= 3.1.0.alpha.50)!
   serve (= 1.0.0)
   thor