Merge branch 'master' into gsoc_breadboard
André Walker [Wed, 4 Jul 2012 18:14:32 +0000 (15:14 -0300)]
1  2 
lib/Catalyst.pm
t/lib/TestApp.pm

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