mark_story 6664acba79 Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/VERSION.txt		2012-09-05 20:15:36 -04:00
..
App.php	allow loading namespaced classes	2012-05-27 19:59:07 +02:00
CakePlugin.php	rtim files	2012-07-18 03:55:29 +02:00
Configure.php	rtim files	2012-07-18 03:55:29 +02:00
Object.php	Code standards fixes, unneeded break statements	2012-09-04 11:30:52 -07:00