mark_story 705e90bef7 Merge branch '1.3' into 2.0-merge ... Conflicts: cake/libs/cache/memcache.php cake/libs/cake_session.php cake/libs/model/behaviors/acl.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/cake_test_fixture.test.php cake/tests/cases/libs/model/behaviors/acl.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php		2010-08-15 23:09:02 -04:00
..
libs	Merge branch '1.3' into 2.0	2010-07-24 22:34:42 -04:00
templates	Changing config value name to more accurately represent what it does.	2010-07-27 22:27:43 -04:00
cake	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cake.bat	Applying patch from 'Mark Mitchell' to fix auto exiting of cake.bat. Fixes #992	2010-08-14 18:54:12 -04:00
cake.php	Fixing notices introduced in last commit	2010-07-07 23:03:24 -04:30
error.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00