merge master

diff --cc .gitignore
Simple merge

diff --cc Makefile.PL
index c00267d,a2d9499..912cd95
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -51,8 -53,10 +54,11 @@@ requires 'MRO::Compat'
  requires 'MooseX::Getopt' => '0.30';
  requires 'MooseX::Types';
  requires 'MooseX::Types::Common::Numeric';
 +requires 'MooseX::Types::LoadableClass';
  requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace
+ requires 'Plack' => '0.9974'; # IIS6 fix middleware
+ requires 'Plack::Middleware::ReverseProxy' => '0.04';
+ requires 'Plack::Test::ExternalServer';
  
  test_requires 'Class::Data::Inheritable';
  test_requires 'Test::Exception';

diff --cc TODO
Simple merge

diff --cc lib/Catalyst.pm
index a727189,6621825..79bdf3d
--- 1/lib/Catalyst.pm
--- 2/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@@ -65,12 -73,11 +72,17 @@@ our $GO        = Catalyst::Exception::G
  #I imagine that very few of these really need to be class variables. if any.
  #maybe we should just make them attributes with a default?
  __PACKAGE__->mk_classdata($_)
++<<<<<<< HEAD
 +  for qw/container arguments dispatcher engine log dispatcher_class
 +  engine_class context_class request_class response_class stats_class
 +  setup_finished/;
++=======
+   for qw/components arguments dispatcher engine log dispatcher_class
+   engine_loader context_class request_class response_class stats_class
+   setup_finished _psgi_app loading_psgi_file/;
++>>>>>>> master
  
  __PACKAGE__->dispatcher_class('Catalyst::Dispatcher');
- __PACKAGE__->engine_class('Catalyst::Engine::CGI');
  __PACKAGE__->request_class('Catalyst::Request');
  __PACKAGE__->response_class('Catalyst::Response');
  __PACKAGE__->stats_class('Catalyst::Stats');

diff --cc lib/Catalyst/Dispatcher.pm
Simple merge