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
..
Config	Merge remote-tracking branch 'origin/2.0' into 2.0-merge	2011-05-15 00:40:54 -04:30
Console	Partial migration of folders to camelcase in app	2011-03-22 00:46:51 -04:30
Controller/Component	Partial migration of folders to camelcase in app	2011-03-22 00:46:51 -04:30
Lib	Partial migration of folders to camelcase in app	2011-03-22 00:46:51 -04:30
Locale/eng/LC_MESSAGES	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Model	Partial migration of folders to camelcase in app	2011-03-22 00:46:51 -04:30
Plugin	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Test	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
tmp	fix file permissions	2011-03-16 16:06:44 +01:00
Vendor/shells	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
View	Renaming elements and layouts	2011-05-13 02:45:36 -04:30
webroot	bye bye webroot/css.php	2011-04-18 12:05:50 +02:00
.htaccess	Merging fixes and enhancements into trunk	2006-02-18 23:42:21 +00:00
index.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00