prep

bump

Merge branch 'master' of github.com:middleman/middleman

ignore all ds_store

tests for content_tag escaping

Prevent relative asset helper from munging data URIs. Closes middlema…

…n#938.

new rc

Force padrino to skip safebuffer on erb

layouts_dir is now configurable. Closes middleman#899

bump