Chris Eppstein c4e9d00d61 Merge branch 'stable' ... Conflicts: VERSION.yml doc-src/content/CHANGELOG.markdown lib/compass/configuration/helpers.rb test/units/sass_extensions_test.rb		2011-12-23 17:16:44 -08:00
..
blueprint	Reset only the block HTML elements #339	2011-07-10 17:26:23 -07:00
compass	Merge branch 'stable'	2011-12-23 17:16:44 -08:00