mark_story 48d2618c62 Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/Routing/Router.php		2013-12-08 21:25:59 -05:00
..
bake_compare/Controller	fix renderLayout and update deprecated and outdated code	2013-09-13 00:09:31 +02:00
Case	Merge branch 'master' into 2.5	2013-12-08 21:25:59 -05:00
Fixture	Merge branch 'imsamurai-2.5' into 2.5	2013-11-27 20:12:28 -05:00
test_app	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00