mark_story 587f2da09e Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt		2014-05-22 14:29:43 -04:00
..
bake_compare/Controller	Updated bake templates to use CakeRequest::allowMethod()	2014-02-10 17:56:57 +05:30
Case	Merge branch 'master' into 2.6	2014-05-22 14:29:43 -04:00
Fixture	Merge branch 'master' into 2.5	2014-03-21 22:55:28 -04:00
test_app	Merge branch 'master' into 2.5	2014-04-06 21:50:41 +02:00