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	Merge branch 'master' into stable	2012-03-11 18:30:25 -07:00
compass.rb	Upgrade notifications for compass rails users to use the compass-rails gem.	2012-02-02 13:59:20 -08:00