mark_story 8d1457e048 Merge branch '1.3' into 1.3-bake-integration ... Conflicts: cake/console/libs/tasks/controller.php cake/console/libs/tasks/model.php		2009-07-06 22:20:03 -04:00
..
default	Merge branch '1.3' into 1.3-bake-integration	2009-07-06 22:20:03 -04:00
skel	fixing undefined variable when new project is baked from skel	2009-06-05 19:05:05 -07:00