mark_story 4b13e0a5f2 Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/VERSION.txt		2013-03-04 21:55:29 -05:00
..
App.php	== to === and != to !== where applicable	2013-02-12 03:38:08 +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