Merge remote-tracking branch 'upstream/master'
Charlie Garrison [Sun, 28 Sep 2014 02:52:48 +0000 (12:52 +1000)]
1  2 
lib/Catalyst.pm

diff --cc lib/Catalyst.pm
Simple merge