fix conflicts
Merge branch 'master' of ssh://github.com/php-mod/haml