mark_story 041c2d289f Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Console/Shell.php		2013-03-26 20:31:54 -04:00
..
App.php	Only load the object cache when requested.	2013-03-20 21:26:42 -04: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