Jose Lorenzo Rodriguez 91bce16e9d Merge remote-tracking branch 'origin/2.0' into 2.0-merge ... Conflicts: lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php lib/Cake/Test/Case/Log/Engine/FileLog.php lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php lib/Cake/tests/Case/Log/Engine/FileLog.php lib/Cake/tests/Case/Log/Engine/FileLogTest.php lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php		2011-05-15 00:40:54 -04:30
..
Component	Merge remote-tracking branch 'origin/2.0' into 2.0-merge	2011-05-15 00:40:54 -04:30
AppController.php	Fixing SessionComponent tests	2011-01-28 02:00:20 -04:30
CakeErrorController.php	Removing legacy parameter setting.	2011-05-01 23:30:23 +02:00
Component.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ComponentCollection.php	PhpDoc fixes	2011-04-17 11:23:52 -04:00
Controller.php	Search and replace for changed paths	2011-05-13 02:53:35 -04:30
PagesController.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
Scaffold.php	Fixing controller tests	2011-05-15 00:14:41 -04:30