merged PR
John Napiorkowski [Wed, 22 Jul 2015 17:20:42 +0000 (12:20 -0500)]
1  2 
lib/Catalyst.pm

diff --cc lib/Catalyst.pm
Simple merge