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
..
compass	Merge branch 'stable'	2011-12-23 17:16:44 -08:00
compass.rb	fixed cucumber features	2011-11-17 18:40:42 -05:00