Merge branch 'stable'

Conflicts:
	CHANGELOG.md
	Gemfile
	lib/haml/helpers.rb
	lib/haml/version.rb

CHANGELOG.md

@@ -11,6 +11,18 @@
 * General performance and memory usage improvements. (Akira Matsuda)
 * Don't treat the 'data' attribute specially when merging attribute hashes. (Matt Wildig and Norman Clarke)
 
+## 4.0.3
+
+Released May 21, 2013 ([diff](https://github.com/haml/haml/compare/4.0.2...4.0.3)).
+
+* Compatibility with newer versions of Rails's Erubis handler.
+* Fix Erubis handler for compatibility with Tilt 1.4.x, too.
+* Small performance optimization for html_escape.
+(thanks [Lachlan Sylvester](https://github.com/lsylvester))
+* Documentation fixes.
+* Documented some helper methods that were left out of the reference.
+(thanks [Shane Riley](https://github.com/shaneriley))
+
 ## 4.0.2
 
 Released April 5, 2013 ([diff](https://github.com/haml/haml/compare/4.0.1...4.0.2)).

lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.1.0.alpha.0"
+  VERSION = "4.1.0.alpha.1"
 end

test/gemfiles/Gemfile.rails-4.0.x

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
 gem 'bundler', '~> 1.3.0'
-gem 'rails', '~> 4.0.0.beta.1'
+gem 'rails', '~> 4.0.0.rc1'
 gemspec :path => '../..'