mark_story 7c0cda7ce5 Merge branch '2.0' into 2.0-request ... Conflicts: cake/libs/router.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/controller/components/auth.test.php cake/tests/cases/libs/controller/components/request_handler.test.php cake/tests/cases/libs/controller/controller.test.php cake/tests/cases/libs/router.test.php cake/tests/cases/libs/view/helpers/html.test.php cake/tests/cases/libs/view/helpers/js.test.php		2010-06-28 23:41:48 -04:00
..
cases	Merge branch '2.0' into 2.0-request	2010-06-28 23:41:48 -04:00
fixtures	Changing classes names to match their filename and make pass the CakeTestCase test	2010-06-24 10:52:43 -04:30
lib	Fixing comments in file.	2010-06-28 23:01:25 -04:00
test_app	Merge branch '2.0-phpunit' into 2.0	2010-06-28 22:31:35 -04:00