projects / catagits/Catalyst-Runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9d41c5 f11a669)
Merge branch 'master' into psgi
Florian Ragwitz [Thu, 28 Jul 2011 15:26:00 +0000 (17:26 +0200)]
* 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


Trivial merge
The Perl MVC Framework (catagits@git.shadowcat.co.uk:Catalyst-Runtime.git)