José Lorenzo Rodríguez 6e4f4efb79 Merge remote branch 'origin/2.0' into 2.0-class-loading ... Conflicts: cake/bootstrap.php lib/Cake/Console/Command/TestSuiteShell.php lib/Cake/Console/TaskCollection.php lib/Cake/Controller/ComponentCollection.php lib/Cake/Controller/Controller.php lib/Cake/Core/App.php lib/Cake/Model/BehaviorCollection.php lib/Cake/Network/CakeRequest.php lib/Cake/TestSuite/CakeTestSuiteDispatcher.php lib/Cake/TestSuite/CakeWebTestCase.php lib/Cake/TestSuite/TestManager.php lib/Cake/TestSuite/TestRunner.php lib/Cake/View/HelperCollection.php lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php lib/Cake/tests/cases/libs/test_manager.test.php		2011-02-13 23:10:19 -04:30
..
Behavior	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
Datasource	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30
AclNode.php	Fixing Acl classes loading for the AclBehavior tests	2011-01-28 01:44:04 -04:30
Aco.php	Extracting acl model classes to their own files	2010-12-22 00:01:03 -04:30
AcoAction.php	Extracting acl model classes to their own files	2010-12-22 00:01:03 -04:30
AppModel.php	Extracting acl model classes to their own files	2010-12-22 00:01:03 -04:30
Aro.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
BehaviorCollection.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30
CakeSchema.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30
ConnectionManager.php	fixing tests from last merge	2011-01-22 01:11:22 -04:30
Model.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30
ModelBehavior.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
Permission.php	Extracting acl model classes to their own files	2010-12-22 00:01:03 -04:30