Merge branch 'stable' of github.com:chriseppstein/compass

.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+  - rbx
+  - ree

Gemfile

@@ -7,7 +7,7 @@ gem "rspec", "~>2.0.0"
 gem "rails", "~>3.0.0.rc"
 gem "compass-validator", "3.0.0"
 gem "css_parser", "~> 1.0.1"
-gem "sass", "3.1"
+gem "sass", "~>3.1"
 gem "haml", "~> 3.1"
 gem "rcov"
 gem "rubyzip"

Gemfile.lock

@@ -120,8 +120,7 @@ GEM
     ruby-json (1.1.2)
     ruby-prof (0.10.5)
     rubyzip (0.9.4)
-    sass (3.1.0)
+    sass (3.1.1)
-    sys-uname (0.8.5)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     timecop (0.3.5)
@@ -150,5 +149,5 @@ DEPENDENCIES
   rspec (~> 2.0.0)
   ruby-prof
   rubyzip
-  sass (= 3.1)
+  sass (~> 3.1)
   timecop