mark_story 24b636cc71 Merge branch 'mergers' into 1.2-merger ... Conflicts: cake/libs/view/helpers/text.php cake/tests/cases/libs/view/helpers/text.test.php		2009-12-06 22:03:17 -05:00
..
console	Merge branch '1.3-misc' into mergers	2009-12-06 21:11:26 -05:00
libs	Merge branch 'mergers' into 1.2-merger	2009-12-06 22:03:17 -05:00
basics.test.php	Adding ability to provide default plugin value to pluginSplit().	2009-11-15 19:54:33 -05:00
dispatcher.test.php	Removing unneeded code in Dispatcher::cached();	2009-11-27 00:49:20 -06:00