mark_story 443f6d1c5b Merge branch '1.3' into merger ... Conflicts: cake/console/shells/tasks/test.php cake/libs/cake_log.php cake/libs/controller/components/email.php cake/libs/set.php cake/libs/view/helpers/cache.php cake/libs/view/helpers/paginator.php cake/libs/view/helpers/time.php cake/libs/view/view.php cake/tests/cases/console/libs/tasks/fixture.test.php cake/tests/cases/console/shells/tasks/test.test.php cake/tests/cases/libs/controller/components/email.test.php cake/tests/cases/libs/model/db_acl.test.php cake/tests/cases/libs/set.test.php		2011-01-08 23:49:19 -05:00
..
elements	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
errors	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
helpers	Merge branch '1.3' into merger	2011-01-08 23:49:19 -05:00
layouts	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
pages	Fixing fatal error caused by Debugger not being loaded when viewing the default home page.	2010-12-27 00:07:47 -05:00
scaffolds	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
helper.php	Removing deprecated $this->params in Helpers, it got missed somehow.	2010-12-26 13:01:20 -05:00
helper_collection.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
media.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
scaffold.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
theme.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
view.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00