Nathan Weizenbaum 551f362ace Merge branch 'stable' ... Conflicts: lib/sass/script/color.rb		2009-12-01 18:26:28 -08:00
..
merb.rb	[Sass] Use Plugin.check_for_updates in plugin/merb.	2009-11-09 17:16:59 -08:00
rack.rb	Update a bunch of docs to use the new YARD hash syntax.	2009-12-01 18:25:49 -08:00
rails.rb	[Sass] Use Rack for Rails support by default.	2009-11-13 22:50:16 -08:00