Merge branch 'stable'

Conflicts:
	TODO
	VERSION
	doc-src/HAML_CHANGELOG.md

TODO

@@ -18,6 +18,10 @@
     Lexer errors in particular are icky
     See in particular error changes made in c07b5c8
 ** Haml
+   Interpolation shouldn't make non-interpolated strings escaped under :escape_html
+     I think we can just wrap interpolated code with (),
+     since it's already interpolated.
+   Can also use () to wrap contents of _haml_temp so that commas throw errors when not in :ugly
    [2.4] Support finer-grained HTML-escaping in filters
    [2.4] Allow "!!! HTML5" to set :format => :html5 ?
      How do we deal with partials?

doc-src/HAML_CHANGELOG.md

@@ -12,6 +12,19 @@ for a given object by implementing the `haml_object_ref` method on that object.
 This method should return a string that will be used in place of the class name of the object
 in the generated class and id.
 
+## [2.2.2](http://github.com/nex3/haml/commit/2.2.2)
+
+Haml 2.2.2 is a minor bugfix release, with several notable changes.
+First, {file:Haml/Helpers.html#haml_concat-instance_method `haml_concat`}
+will now raise an error when used with `=`.
+This has always been incorrect behavior,
+and in fact has never actually worked.
+The only difference is that now it will fail loudly.
+Second, Ruby 1.9 is now more fully supported,
+especially with the {file:HAML_REFERENCE#htmlstyle_attributes_ new attribute syntax}.
+Third, filters are no longer escaped when the {file:HAML_REFERENCE#escape_html-option `:escape_html` option}
+is enabled and `#{}` interpolation is used.
+
 ## [2.2.1](http://github.com/nex3/haml/commit/2.2.1)
 
 Haml 2.2.1 is a minor bug-fix release.

doc-src/SASS_CHANGELOG.md

@@ -3,6 +3,12 @@
 * Table of contents
 {:toc}
 
+## [2.2.2](http://github.com/nex3/haml/commit/2.2.2)
+
+Sass 2.2.2 is a minor bug-fix release.
+Notable changes include better parsing of mixin definitions and inclusions
+and better support for Ruby 1.9.
+
 ## [2.2.1](http://github.com/nex3/haml/commit/2.2.1)
 
 Sass 2.2.1 is a minor bug-fix release.