mark_story 9b08b725fe Merge branch '2.0' into 2.0-view ... Conflicts: cake/libs/controller/controller.php cake/libs/view/helpers/cache.php		2010-11-13 21:03:54 -05:00
..
cases	Merge branch '2.0' into 2.0-view	2010-11-13 21:03:54 -05:00
fixtures	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
lib	Removing =& operators for construction of objects.	2010-11-12 23:05:44 -05:00
test_app	Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation.	2010-11-07 13:23:45 -05:00