Merge branch 'stable'

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

doc-src/HAML_CHANGELOG.md

@@ -188,6 +188,13 @@ that surrounds the filtered text with `<style>` and CDATA tags.
 * The `puts` helper has been removed.
   Use {Haml::Helpers#haml\_concat} instead.
 
+## 2.2.19
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.19).
+
+* Fix a bug with the integration with Rails' XSS support.
+  In particular, correctly override `safe_concat`.
+
 ## 2.2.18
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.18).

doc-src/SASS_CHANGELOG.md

@@ -211,6 +211,12 @@ 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.19
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.18).
+
+There were no changes made to Sass between versions 2.2.18 and 2.2.19.
+
 ## 2.2.18
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.18).

lib/haml/helpers/xss_mods.rb

@@ -114,7 +114,7 @@ module ActionView
           if is_haml?
             haml_buffer.buffer.concat(string)
           else
-            concat_without_haml(string)
+            safe_concat_without_haml(string)
           end
         end
         alias_method :safe_concat_without_haml, :safe_concat