7 commits

Author	SHA1	Message	Date
Nathan Weizenbaum	8f696076f4	Merge branch 'stable' ... Conflicts: doc-src/HAML_CHANGELOG.md lib/haml/util.rb	2009-11-11 14:30:46 -08:00
Nathan Weizenbaum	90fb7c3066	[Haml] Don't print errors for #escape_once under 1.9.	2009-11-11 14:30:11 -08:00
Nathan Weizenbaum	7e69bacc72	[Haml] Add a method for parsing the output of Kernel#caller to Util.	2009-10-25 13:24:22 -07:00
Nathan Weizenbaum	d637e86d8c	[Haml] Add a test for Haml::Utils.merge_adjacent_strings.	2009-10-14 19:33:13 -07:00
Nathan Weizenbaum	f4ef490475	[Haml] Move Version#scope to Util#scope.	2009-04-30 14:22:05 -07:00
Chris Eppstein	beb9ba7215	[Haml] Disable the powerset test when set equality is broken (Fixed in Ruby 1.8.7+)	2009-04-05 02:27:50 -07:00
Nathan Weizenbaum	25ba42a039	[Haml] Add tests for Haml::Util.	2009-03-25 21:42:22 -07:00