Ben Hollis 52c4677391 Merge remote-tracking branch 'origin/3.0-stable' ... Conflicts: middleman-core/lib/middleman-core/core_extensions/data.rb middleman-core/lib/middleman-core/core_extensions/front_matter.rb middleman-core/lib/middleman-core/util.rb middleman-core/middleman-core-x86-mingw32.gemspec middleman-more/lib/middleman-more/core_extensions/default_helpers.rb middleman-more/lib/middleman-more/core_extensions/i18n.rb		2013-02-10 15:41:36 -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-02-10 15:41:36 -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