Merge branch 'master' into gsoc_breadboard
André Walker [Thu, 20 Oct 2011 20:34:29 +0000 (18:34 -0200)]
1  2 
lib/Catalyst.pm

diff --cc lib/Catalyst.pm
Simple merge