mark_story d12c232d8a Merge branch '1.3' into merger ... Conflicts: app/config/core.php cake/console/templates/skel/config/core.php cake/dispatcher.php cake/libs/controller/components/auth.php cake/libs/view/helpers/form.php cake/tests/cases/libs/cake_test_case.test.php cake/tests/cases/libs/controller/components/security.test.php cake/tests/cases/libs/model/models.php cake/tests/cases/libs/router.test.php cake/tests/cases/libs/view/helpers/paginator.test.php cake/tests/lib/cake_test_case.php		2010-11-16 21:48:13 -05:00
..
cases	Merge branch '1.3' into merger	2010-11-16 21:48:13 -05:00
fixtures	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
lib	Removing =& operators for construction of objects.	2010-11-12 23:05:44 -05:00
test_app	Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation.	2010-11-07 13:23:45 -05:00