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
..
Auth	Remove whitespace [Gun.io WhitespaceBot]	2011-10-28 18:25:08 -04:00
AclComponent.php	Changing a bunch of links in doc blocks	2011-10-15 10:43:26 -04:30
AuthComponent.php	Dropped support for wildcard in AuthComponent::allow()	2011-11-15 23:01:04 -05:00
CookieComponent.php	Fixing more links in doc blocks	2011-10-15 11:38:49 -04:30
EmailComponent.php	Fixing more links in doc blocks	2011-10-15 11:38:49 -04:30
PaginatorComponent.php	Add sorting on joined model virtual field, fixes #2250	2011-11-17 00:18:12 +01:00
RequestHandlerComponent.php	Fix ambiguous content types in RequestHandler.	2011-11-15 22:48:54 -05:00
SecurityComponent.php	Removing _Token from request data.	2011-11-15 22:51:04 -05:00
SessionComponent.php	Fixing more links in doc blocks	2011-10-15 11:38:49 -04:30