Merge branch 'master' into gsoc_breadboard gsoc_breadboard
André Walker [Sat, 20 Oct 2012 05:25:28 +0000 (02:25 -0300)]
1  2 
lib/Catalyst.pm
lib/Catalyst/Controller.pm

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