Merge branch 'ancona' into ancona-trace
John Napiorkowski [Sat, 28 Jun 2014 13:46:05 +0000 (09:46 -0400)]
1  2 
lib/Catalyst.pm
lib/Catalyst/Engine.pm

diff --cc lib/Catalyst.pm
Simple merge
Simple merge