Merge branch 'master' into psgi
authorFlorian Ragwitz <rafl@debian.org>
Wed, 6 Jul 2011 00:06:31 +0000 (02:06 +0200)
committerFlorian Ragwitz <rafl@debian.org>
Wed, 6 Jul 2011 00:06:31 +0000 (02:06 +0200)
commit97c67a13934ab0285169d7c652b408640430b1e4
treecfa42e3e27213b44f1705e10c28f8999796bc25d
parent1126710650625d97b4fba9965ea55092bcc46095
parentf899107d00c9414a83e8a48386e298ba6e270af3
Merge branch 'master' into psgi

* master:
  More disable_component_resolution_regex_fallback
  give an example for $c->request->path
  fix typo

Conflicts:
Changes
Changes
lib/Catalyst.pm