haml-rails
Merge pull request #2 from heruku/kevin

haml-rails
Merge pull request #4 from heruku/master

pr'ed into master by accident. pr'ing master into dev