Merge branch 'master' into gsoc_breadboard
André Walker [Fri, 3 Feb 2012 18:22:09 +0000 (16:22 -0200)]
1  2 
lib/Catalyst.pm
t/author/spelling.t

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