Merge branch 'stable'

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

doc-src/HAML_CHANGELOG.md

@@ -29,7 +29,7 @@ Haml and `html2haml` now produce more descriptive errors
 when given a template with invalid byte sequences for that template's encoding,
 including the line number and the offending character.
 
-## 2.2.9 (Unreleased)
+## [2.2.9](http://github.com/nex3/haml/commit/2.2.9)
 
 * Fixed a bug where Haml's text was concatenated to the wrong buffer
   under certain circumstances.

doc-src/HAML_REFERENCE.md

@@ -130,10 +130,11 @@ Available options are:
 
 {#escape_html-option} `:escape_html`
 : Sets whether or not to escape HTML-sensitive characters in script.
-  If this is true, `=` behaves like `&=`;
-  otherwise, it behaves like `!=`.
+  If this is true, `=` behaves like [`&=`](#escaping_html);
+  otherwise, it behaves like [`!=`](#unescaping_html).
   Note that if this is set, `!=` should be used for yielding to subtemplates
   and rendering partials.
+  See also [Escaping HTML](#escaping_html) and [Unescaping HTML](#unescaping_html)
   Defaults to false.
 
 {#ugly-option} `:ugly`

doc-src/SASS_CHANGELOG.md

@@ -51,6 +51,10 @@ Several bug fixes and minor improvements have been made, including:
 * Displaying the expected strings as strings rather than regular expressions
   whenever possible.
 
+## [2.2.9](http://github.com/nex3/haml/commit/2.2.9)
+
+There were no changes made to Sass between versions 2.2.8 and 2.2.9.
+
 ## [2.2.8](http://github.com/nex3/haml/commit/2.2.8)
 
 There were no changes made to Sass between versions 2.2.7 and 2.2.8.