Merge branch 'master' into psgi
authorFlorian Ragwitz <rafl@debian.org>
Thu, 28 Jul 2011 15:26:00 +0000 (17:26 +0200)
committerFlorian Ragwitz <rafl@debian.org>
Thu, 28 Jul 2011 15:26:00 +0000 (17:26 +0200)
commit39e8d5b4c30b661b124de07b517e9b672e683386
tree017795600684ca113162395cffcaf861ff15d61a
parentd9d41c5af176289832bdb455ec18d3436cf69330
parentf11a6699f17a6a4bbdfb63fe07b0605719112925
Merge branch 'master' into psgi

* master:
  Lion is like Snow Leopard when it comes to tar issues
  Warning fix
  Add _set_env writer to non-PSGI Catalyst
  Remove trailing whitespace

Conflicts:
lib/Catalyst/Engine.pm
lib/Catalyst/Engine/CGI.pm