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
..
Helper	Merge branch '1.3' into merger	2011-10-01 22:38:20 -04:00
HelperCollectionTest.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
HelperTest.php	Fix entity names for associated model date fields.	2011-09-17 12:29:21 -04:00
MediaViewTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
ScaffoldViewTest.php	Splitting apart the Scaffold and ScaffoldView tests.	2011-09-16 22:08:19 -04:00
ThemeViewTest.php	Typo in last commit. Making flexible the range for memory usage in theme view after changing internal templates	2011-09-18 16:43:00 -04:30
ViewTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00