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

This commit is contained in:
Thomas Reynolds 2013-01-09 13:24:41 -08:00
commit 7231f9dfe2

Diff content is not available