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
..
Behavior	Merge remote-tracking branch 'origin/1.3' into merger	2011-05-04 01:10:23 -04:30
Datasource	Merge remote-tracking branch 'origin/1.3' into merger	2011-05-04 01:10:23 -04:30
AclNode.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
Aco.php	Extracting acl model classes to their own files	2010-12-22 00:01:03 -04:30
AcoAction.php	Extracting acl model classes to their own files	2010-12-22 00:01:03 -04:30
AppModel.php	Extracting acl model classes to their own files	2010-12-22 00:01:03 -04:30
Aro.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
BehaviorCollection.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
CakeSchema.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
ConnectionManager.php	Adding a ConenctionManager::drop() method useful for testing and other dynamic tasks	2011-04-16 22:57:05 -04:30
Model.php	Changed default value for key 'last' in validator options to true. Also implemented ability to list messages for all failed validations for a field at once, instead of current display of just one message at a time.	2011-04-18 02:08:48 +05:30
ModelBehavior.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
Permission.php	Extracting acl model classes to their own files	2010-12-22 00:01:03 -04:30