mark_story 0f2d59d987 Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Network/CakeResponse.php lib/Cake/TestSuite/CakeTestCase.php		2013-08-18 23:10:08 -04:00
..
App.php	Don't use inline assignment.	2013-07-09 21:11:06 -04:00
CakePlugin.php	unify null checks - avoid method call in favor of strict check	2013-08-16 20:12:49 +02:00
Configure.php	Shortened line length of trigger_error calls and improved @param of write()	2013-08-15 17:09:24 +02:00
Object.php	Renaming base url config keys and methods for better uniformity.	2013-08-01 00:44:36 +05:30