Jose Lorenzo Rodriguez d83555cc52 Merge remote-tracking branch 'origin/1.3' into merger ... Conflicts: cake/console/cake.php cake/dispatcher.php cake/libs/controller/components/auth.php cake/libs/controller/controller.php cake/libs/view/helpers/xml.php cake/libs/view/pages/home.ctp cake/libs/xml.php cake/tests/cases/console/cake.test.php cake/tests/cases/libs/controller/components/cookie.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php cake/tests/cases/libs/view/helpers/xml.test.php cake/tests/cases/libs/xml.test.php lib/Cake/Console/Command/SchemaShell.php lib/Cake/Controller/Component/CookieComponent.php lib/Cake/Network/Http/HttpSocket.php lib/Cake/TestSuite/Fixture/CakeTestFixture.php lib/Cake/VERSION.txt lib/Cake/View/Helper/FormHelper.php lib/Cake/View/Helper/TextHelper.php lib/Cake/View/Helper/TimeHelper.php lib/Cake/config/config.php lib/Cake/tests/Case/Cache/CacheTest.php lib/Cake/tests/Case/Model/CakeSchemaTest.php lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php		2011-05-04 01:10:23 -04:30
..
Database	Merge remote-tracking branch 'origin/1.3' into merger	2011-05-04 01:10:23 -04:30
Session	Small refactoring, and adding some App::uses() to avoid problems	2011-04-21 17:56:03 -04:30
CakeSession.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
DataSource.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-02-27 22:50:53 -04:30
DboSource.php	Merge remote-tracking branch 'origin/1.3' into merger	2011-05-04 01:10:23 -04:30