Merge remote branch 'svn/trunk' into psgi
authorFlorian Ragwitz <rafl@debian.org>
Sun, 5 Dec 2010 13:00:18 +0000 (13:00 +0000)
committerFlorian Ragwitz <rafl@debian.org>
Sun, 5 Dec 2010 13:00:18 +0000 (13:00 +0000)
commit182f8b1e3c426d62337e186c2409c555794152d7
tree187cd33d980a5494d9ad699ee465d2ee1b8448f3
parent3245a7701a8e15f08a6a881c58055dfd95c6cf33
parent8865ee1205d2f74a601105ae6c85af2cceb8ad7d
Merge remote branch 'svn/trunk' into psgi

svn/trunk:
Rename --title to --proc_title as that makes more sense. Remove -t option as it's confusing..
Update changelog

Conflicts:
lib/Catalyst/Engine/FastCGI.pm
lib/Catalyst/Script/FastCGI.pm
t/aggregate/unit_core_script_fastcgi.t
lib/Catalyst/Script/FastCGI.pm
t/aggregate/unit_core_script_fastcgi.t