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
..
ClassRegistry.php	Changed methods and attributes from private to protected.	2011-08-20 00:43:34 -04:00
Debugger.php	Add 'trace' to the data provided to Debugger formats.	2011-09-28 23:26:38 -04:00
File.php	Merge branch '1.3' into merger	2011-09-03 00:48:09 +01:00
Folder.php	Redoing fix done in 155968349f	2011-09-22 22:05:36 -04:00
Inflector.php	Merge branch '1.3' into merger	2011-10-01 22:38:20 -04:00
ObjectCollection.php	Removing trailing spaces.	2011-08-15 23:55:08 -04:00
Sanitize.php	Fixed documentation to methods that use func_get_args().	2011-08-21 21:45:34 -04:00
Security.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
Set.php	Changed the visibility to methods that not affect others classes.	2011-08-20 01:39:30 -04:00
String.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
Validation.php	Merge branch '1.3' into merger	2011-10-01 22:38:20 -04:00
Xml.php	Changed methods and attributes from private to protected.	2011-08-20 00:43:34 -04:00