José Lorenzo Rodríguez 4cebe55a9b Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading ... Conflicts: app/webroot/index.php lib/Cake/Controller/Component/AuthComponent.php lib/Cake/Network/CakeRequest.php lib/Cake/tests/cases/libs/controller/components/auth.test.php		2011-02-21 22:28:30 -04:30
..
Command	Making the test suite load again	2011-02-13 23:56:41 -04:30
templates	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-02-21 22:28:30 -04:30
AppShell.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
cake	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
cake.bat	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-02-21 22:28:30 -04:30
cake.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ConsoleErrorHandler.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ConsoleInput.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ConsoleInputArgument.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ConsoleInputOption.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ConsoleInputSubcommand.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ConsoleOptionParser.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ConsoleOutput.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
HelpFormatter.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
Shell.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30
ShellDispatcher.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-02-21 22:28:30 -04:30
TaskCollection.php	Resolving conflict left out in previous commit	2011-02-13 23:42:41 -04:30