Merge branch 'stable'

extra/haml-mode.el

@@ -113,6 +113,7 @@ text nested beneath them.")
     (define-key map "\C-C\C-k" 'haml-kill-line-and-indent)
     map))
 
+;;;###autoload
 (define-derived-mode haml-mode fundamental-mode "Haml"
   "Major mode for editing Haml files.
 

extra/sass-mode.el

@@ -69,6 +69,7 @@ text nested beneath them.")
 
 ;; Mode setup
 
+;;;###autoload
 (define-derived-mode sass-mode haml-mode "Sass"
   "Major mode for editing Sass files."
   (set (make-local-variable 'haml-indent-function) 'sass-indent-p)

lib/haml/html.rb

@@ -148,7 +148,6 @@ module Haml
           output += haml_attributes if attributes.length > 0
         end
 
-        output += "/" if children.length == 0
         output += "\n"
 
         self.children.each do |child|