Merge branch 'psgi' into origin/psgi
John Napiorkowski [Sat, 7 May 2011 01:48:18 +0000 (21:48 -0400)]
1  2 
lib/Catalyst.pm

diff --cc lib/Catalyst.pm
Simple merge