mark_story c597855fe4 Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Test/Case/Network/CakeRequestTest.php		2013-07-03 14:21:09 -04:00
..
App.php	Make check for .. more specific.	2013-07-03 14:19:39 -04:00
CakePlugin.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Configure.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Object.php	Merge pull request #1317 from lorenzo/feature/full-base-url	2013-06-05 15:12:27 -07:00