From: Florian Ragwitz <rafl@debian.org>
Date: Thu, 28 Jul 2011 15:26:00 +0000 (+0200)
Subject: Merge branch 'master' into psgi
X-Git-Tag: 5.89003~7
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=39e8d5b4c30b661b124de07b517e9b672e683386

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
---

39e8d5b4c30b661b124de07b517e9b672e683386