mark_story f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 ... differences upon merging. Conflicts: app/config/core.php cake/console/templates/skel/config/core.php cake/libs/cache/file.php cake/libs/cake_session.php cake/libs/controller/components/email.php cake/libs/i18n.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/cache/memcache.test.php cake/tests/cases/libs/model/model_write.test.php		2010-09-24 23:27:22 -04:00
..
home.ctp	Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0	2010-09-24 23:27:22 -04:00