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
..
blueprint	Smarter sidebar logic	2010-12-18 16:25:49 -08:00
compass	Merge branch 'master' into stable	2012-03-11 18:30:25 -07:00
blueprint.haml	Some doc modifications.	2010-08-31 22:39:59 -07:00
compass.haml	general typography improvements	2010-12-08 23:02:20 -06:00