0
@@ -22,9 +22,7 @@
0
 # Require this rather than autoloading it so we can be sure the default template
0
 # gets registered
0
 require 'merb-core/core_ext'
0
-require 'merb-core/hook'
0
 require "merb-core/controller/template"
0
-require "merb-core/hook"
0
 
0
 module Merb
0
   module InlineTemplates; end

0
@@ -69,7 +69,6 @@
0
 class Merb::AbstractController
0
   include Merb::RenderMixin
0
   include Merb::InlineTemplates
0
-  is_hookable
0
   
0
   class_inheritable_accessor :_before_filters, :_after_filters, :_layout, :_template_root
0
 
0
@@ -186,7 +185,7 @@
0
     @_template_stack = []
0
   end
0
   
0
-  # This will dispatch the request, calling before and after dispatch hooks
0
+  # This will dispatch the request, calling setup_session and finalize_session
0
   # 
0
   # ==== Parameters
0
   # action<~to_s>::