Ben Hollis 4745418200 Merge remote-tracking branch 'origin/3.0-stable' ... Conflicts: .travis.yml Gemfile middleman-core/lib/middleman-core/version.rb middleman-core/middleman-core-x86-mingw32.gemspec middleman-core/middleman-core.gemspec		2013-03-02 22:32:03 -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 remote-tracking branch 'origin/3.0-stable'	2013-03-02 22:32:03 -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