Nathan Weizenbaum b076eceef0 Merge branch 'master' into precompiler-refactor ... Conflicts: lib/haml/buffer.rb lib/haml/helpers.rb lib/haml/precompiler.rb		2010-10-26 23:30:36 -07:00
..
options.rb	[Haml] Separate out Haml::Template.options and load it early under Rails 3.	2010-05-01 14:04:16 -07:00
patch.rb	[Haml] Don't document template/*.rb.	2009-04-30 12:45:59 -07:00
plugin.rb	Merge branch 'master' into precompiler-refactor	2010-10-26 23:30:36 -07:00