José Lorenzo Rodríguez d9c99b5ef6 Merge remote branch 'origin/2.0' into 2.0-class-loading ... Conflicts: cake/tests/cases/libs/controller_test_case.test.php lib/Cake/Controller/ComponentCollection.php lib/Cake/Model/ConnectionManager.php lib/Cake/TestSuite/Fixture/CakeTestFixture.php lib/Cake/View/pages/home.ctp		2011-01-22 01:00:15 -04:30
..
email	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
js	Moving core view to the new folder and allowing the view class to find those views	2010-12-05 13:07:01 -04:30
rss	Moving core view to the new folder and allowing the view class to find those views	2010-12-05 13:07:01 -04:30
xml	Moving core view to the new folder and allowing the view class to find those views	2010-12-05 13:07:01 -04:30
ajax.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
default.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-22 01:00:15 -04:30
flash.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30