Merge branch 'next'

Conflicts:
	README.md
	lib/bootstrap-sass.rb

3 files changed, 4 insertions, 4 deletions

diff --git a/lib/bootstrap-sass.rb b/lib/bootstrap-sass.rb
index 019e284..2c6c1bc 100644
--- a/lib/bootstrap-sass.rb
+++ b/lib/bootstrap-sass.rb
@@ -4,7 +4,6 @@ module Bootstrap
     def load!
       register_compass_extension if compass?
       register_rails_engine      if rails?
-
       configure_sass
     end
 
@@ -56,6 +55,7 @@ module Bootstrap
     def register_compass_extension
       ::Compass::Frameworks.register(
           'bootstrap',
+          :version               => Bootstrap::VERSION,
           :path                  => gem_path,
           :stylesheets_directory => stylesheets_path,
           :templates_directory   => File.join(gem_path, 'templates')
diff --git a/lib/bootstrap-sass/engine.rb b/lib/bootstrap-sass/engine.rb
index bd82137..2ebe261 100644
--- a/lib/bootstrap-sass/engine.rb
+++ b/lib/bootstrap-sass/engine.rb
@@ -3,7 +3,7 @@ module Bootstrap
     class Engine < ::Rails::Engine
       initializer 'bootstrap-sass.assets.precompile' do |app|
         %w(stylesheets javascripts fonts images).each do |sub|
-          app.config.assets.paths << root.join('assets', sub)
+          app.config.assets.paths << root.join('assets', sub).to_s
         end
         app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff)$)
       end
diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
index dc78dde..89be577 100644
--- a/lib/bootstrap-sass/version.rb
+++ b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.2.0.2'
-  BOOTSTRAP_SHA = 'c068162161154a4b85110ea1e7dd3d7897ce2b72'
+  VERSION = '3.3.0.0'
+  BOOTSTRAP_SHA = '16dbdbd7a2c6cfa3be4e5dcc52249e577c02c84a'
 end