mark_story c9bd97309f Merge branch '1.3' into merger ... Conflicts: cake/libs/configure.php cake/libs/controller/components/email.php cake/libs/model/datasources/dbo/dbo_mysqli.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/controller/components/email.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php lib/Cake/Config/config.php lib/Cake/Console/Command/Task/ViewTask.php lib/Cake/Model/Datasource/DboSource.php lib/Cake/Model/Model.php lib/Cake/Test/Case/Model/ModelReadTest.php lib/Cake/Test/Case/Model/ModelValidationTest.php lib/Cake/Test/Case/Utility/InflectorTest.php lib/Cake/Test/Case/View/Helper/FormHelperTest.php lib/Cake/Utility/Inflector.php lib/Cake/Utility/Validation.php lib/Cake/VERSION.txt lib/Cake/View/Helper.php lib/Cake/View/Helper/FormHelper.php		2011-10-01 22:38:20 -04:00
..
Behavior	Merge branch '1.3' into merger	2011-09-18 12:09:04 -04:00
Datasource	Merge branch '1.3' into merger	2011-10-01 22:38:20 -04:00
AclNode.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
Aco.php	Fixing some @package declarations	2011-09-30 13:17:12 -04:30
AcoAction.php	Fixing some @package declarations	2011-09-30 13:17:12 -04:30
AppModel.php	Fixing some @package declarations	2011-09-30 13:17:12 -04:30
Aro.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
BehaviorCollection.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
CakeSchema.php	Fixed doc block comments.	2011-09-28 22:33:46 +02:00
ConnectionManager.php	Changed methods and attributes from private to protected.	2011-08-20 00:43:34 -04:00
Model.php	Fixing my previous attempt in ef4826e to make Model::_findCount() behave nicely with 'group' option. Refs #1677, #573	2011-09-28 02:58:48 +05:30
ModelBehavior.php	Added visibility in some methods and attributes.	2011-08-18 22:30:28 -04:00
Permission.php	Fixing some @package declarations	2011-09-30 13:17:12 -04:30