Merge branch 'master' into psgi
authorFlorian Ragwitz <rafl@debian.org>
Tue, 12 Apr 2011 00:08:23 +0000 (02:08 +0200)
committerFlorian Ragwitz <rafl@debian.org>
Tue, 12 Apr 2011 00:08:23 +0000 (02:08 +0200)
commit48429f3d90ed27e6f771daa7a9aa0474849b5915
tree6e0a8b74331454603761e16df55f1635172cf5f8
parent64565a07d5d594ae7e18e1e3043d3c8b6e31cfb9
parent9fb936e5346f24e37bcb6d7d67c981d43aedc7bb
Merge branch 'master' into psgi

* master:
  A failing reverse lookup doesn't imply it's a local address
  Tiny tidyups to copyright and license

Conflicts:
lib/Catalyst/Engine/HTTP.pm
lib/Catalyst.pm
lib/Catalyst/Runtime.pm