Ben Hollis 7b46fd6524 Merge remote-tracking branch 'origin/v3-stable' ... Conflicts: CHANGELOG.md middleman-core/lib/middleman-core/core_extensions/rendering.rb middleman-core/lib/middleman-core/extensions.rb middleman-core/lib/middleman-core/version.rb middleman-core/lib/middleman-more/core_extensions/compass.rb middleman-core/lib/middleman-more/core_extensions/default_helpers.rb middleman-core/middleman-core.gemspec		2014-02-22 18:11:37 -08:00
..
default.erb	Merge remote-tracking branch 'origin/v3-stable'	2014-02-22 18:11:37 -08:00