Chris Eppstein c8174b5679 Merge branch 'master' into stable ... Conflicts: Gemfile lib/compass/sass_extensions/functions.rb lib/compass/sass_extensions/functions/trig.rb test/units/sass_extensions_test.rb		2012-03-11 18:30:25 -07:00
..
compass_test.rb	Add a new compass-env() helper that returns the compass environment.	2011-09-20 09:36:40 -07:00
sprites_test.rb	Merge branch 'master' into stable	2012-03-11 18:30:25 -07:00