mark_story 4118477c0a Merge branch '1.3' into merger ... Conflicts: cake/console/templates/default/views/index.ctp cake/libs/cache.php cake/libs/cake_log.php cake/libs/cake_socket.php cake/libs/view/helpers/form.php cake/libs/view/helpers/js.php cake/tests/cases/libs/view/helpers/js.test.php cake/tests/lib/reporter/cake_cli_reporter.php		2011-03-19 09:08:28 -04:00
..
default	Merge branch '1.3' into merger	2011-03-19 09:08:28 -04:00
skel	Syncing skel folder with app folder.	2011-03-12 12:19:06 -05:00