Merge 'trunk' into 'better_scripts'

diff --cc Makefile.PL

index 1bede30,fe7a723..b98a180
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -14,14 -16,14 +16,15 @@@ name 'Catalyst-Runtime'
  all_from 'lib/Catalyst/Runtime.pm';
  
  requires 'List::MoreUtils';
- requires 'namespace::autoclean';
+ requires 'namespace::autoclean' => '0.09';
  requires 'namespace::clean';
+ +requires 'namespace::autoclean';
  requires 'B::Hooks::EndOfScope' => '0.08';
- requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801';
+ requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903';
  requires 'Class::MOP' => '0.83';
- requires 'Moose' => '0.78';
- requires 'MooseX::MethodAttributes::Inheritable' => '0.15';
+ requires 'Moose' => '0.90';
+ requires 'MooseX::MethodAttributes::Inheritable' => '0.17';
+ requires 'MooseX::Role::WithOverloading';
  requires 'Carp';
  requires 'Class::C3::Adopt::NEXT' => '0.07';
  requires 'CGI::Simple::Cookie';
@@@ -45,12 -47,13 +48,13 @@@ requires 'URI' => '1.35'
  requires 'Task::Weaken';
  requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
  requires 'MRO::Compat';
+ +requires 'MooseX::Getopt';
+ +requires 'MooseX::Types';
  requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace
  
- -recommends 'B::Hooks::OP::Check::StashChange';
- -
  test_requires 'Class::Data::Inheritable';
  test_requires 'Test::Exception';
+ test_requires 'Test::More' => '0.88';
  
  # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
  if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.35_05')) {
diff --cc lib/Catalyst.pm
Simple merge
		1	2
Makefile.PL	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Catalyst.pm	patch \|	diff1 \|	diff2 \|	blob \| history