mark_story 3fc627c5f8 Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Controller/Component/AuthComponent.php lib/Cake/Error/ErrorHandler.php lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php lib/Cake/View/Helper/HtmlHelper.php		2013-03-30 22:12:27 -04:00
..
App.php	Add missing App::uses() to avoid fatal error	2013-03-27 17:03:24 +01:00
CakePlugin.php	Added extra line for referencing license file for copyright	2013-02-08 21:22:51 +09:00
Configure.php	Fixes API parse error for link to Configure::read() in the book.	2013-03-03 20:10:09 +01:00
Object.php	Add scopes to Object::log() signature.	2013-03-01 22:25:10 -05:00