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
..
BakeTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ControllerTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30
DbConfigTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-22 01:00:15 -04:30
ExtractTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
FixtureTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-09 23:32:05 -04:30
ModelTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
PluginTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ProjectTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
TemplateTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30
TestTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-09 23:32:05 -04:30
ViewTask.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30