Ben Hollis bb2f40cc72 Merge branch '3.0-stable' ... Conflicts: README.md		2013-02-05 22:07:05 -08:00
..
middleman	Clean up whitespace, play with cane for testing style quality and code complexity	2012-08-13 15:41:07 -07:00
middleman-core	Merge branch '3.0-stable'	2013-02-05 22:07:05 -08:00
middleman-core.rb	Clean up whitespace, play with cane for testing style quality and code complexity	2012-08-13 15:41:07 -07:00