Merge branch 'stable'

Conflicts:
	VERSION
	doc-src/HAML_CHANGELOG.md
	doc-src/SASS_CHANGELOG.md

Rakefile

@@ -90,7 +90,7 @@ end
 task :release_elpa do
   require 'tlsmail'
   require 'time'
-  require 'haml'
+  require scope('lib/haml')
 
   version = Haml.version[:number]
 

doc-src/HAML_CHANGELOG.md

@@ -202,7 +202,9 @@ that surrounds the filtered text with `<style>` and CDATA tags.
 * The `puts` helper has been removed.
   Use {Haml::Helpers#haml\_concat} instead.
 
-## 2.2.21 (Unreleased)
+## 2.2.21
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).
 
 * Fix a few bugs in the git-revision-reporting in {Haml::Version#version}.
   In particular, it will still work if `git gc` has been called recently,

doc-src/SASS_CHANGELOG.md

@@ -230,7 +230,9 @@ Several bug fixes and minor improvements have been made, including:
   and `tealbang(12)` now renders as `tealbang(12)`
   rather than `teal bang(12)`.
 
-## 2.2.21 (Unreleased)
+## 2.2.21
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).
 
 * Fix a few bugs in the git-revision-reporting in {Haml::Version#version}.
   In particular, it will still work if `git gc` has been called recently,

extra/haml-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.20
+;; Version: 2.2.21
 ;; Created: 2007-03-08
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, html

extra/sass-mode.el

@@ -4,11 +4,11 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.20
+;; Version: 2.2.21
 ;; Created: 2007-03-15
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, css
-;; Package-Requires: ((haml-mode "2.2.20"))
+;; Package-Requires: ((haml-mode "2.2.21"))
 
 ;;; Commentary: