mark_story fa0ec44dfd Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Test/Case/Console/Command/CommandListShellTest.php lib/Cake/Test/Case/Error/ExceptionRendererTest.php lib/Cake/Test/Case/Utility/DebuggerTest.php lib/Cake/Test/Case/View/Helper/TextHelperTest.php		2011-11-16 21:31:16 -05:00
..
Behavior	Fix error created in merge with 1.3	2011-10-16 18:58:59 -04:00
Datasource	Add sorting on joined model virtual field, fixes #2250	2011-11-17 00:18:12 +01:00
AclNode.php	Dropping short syntax support for Behavior configuration.	2011-10-15 20:52:41 +02: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
Aro.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
BehaviorCollection.php	fixing typos	2011-10-19 12:19:28 +07:00
CakeSchema.php	Updating for PHP5.4	2011-11-12 21:42:19 -05:00
ConnectionManager.php	Using plugin name on exception thrown and in templates files.	2011-10-16 13:40:36 +02:00
Model.php	Apply patch from 'Carlos Gant'	2011-11-05 16:16:13 -04:00
ModelBehavior.php	fixing typos	2011-10-19 12:19:28 +07:00
Permission.php	Fixing some @package declarations	2011-09-30 13:17:12 -04:30