José Lorenzo Rodríguez 22581516db Merge remote branch 'origin/2.0' into 2.0-class-loading ... Conflicts: lib/Cake/tests/cases/libs/controller/component.test.php lib/Cake/tests/cases/libs/controller/controller.test.php lib/Cake/tests/cases/libs/controller/pages_controller.test.php		2010-12-18 00:04:44 -04:30
..
controller_test_case.php	Removing duplicate class definition that could cause test suite inconsistencies.	2010-12-15 23:33:00 -05:00