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
..
elements	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
errors	Moving more files to the new folder	2011-02-13 23:20:49 -04:30
Helper	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-02-21 22:28:30 -04:30
layouts	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-22 01:00:15 -04:30
pages	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-22 01:00:15 -04:30
scaffolds	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-22 01:00:15 -04:30
Helper.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-28 01:14:59 -04:30
HelperCollection.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30
MediaView.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ScaffoldView.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
ThemeView.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
View.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30