mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Merge branch 'stable'.
We want to merge master and stable so we can merge stable into master in the future, rather than cp-ing commits between the two. Merge branch 'stable'
This commit is contained in:
commit
beb6acc234