Merge branch 'master' into gsoc_breadboard
André Walker [Thu, 6 Oct 2011 12:51:41 +0000 (09:51 -0300)]
1  2 
lib/Catalyst.pm
lib/Catalyst/Controller.pm

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