Merge branch 'master' into gsoc_breadboard
André Walker [Tue, 5 Jul 2011 14:48:38 +0000 (11:48 -0300)]
1  2 
lib/Catalyst.pm

diff --cc lib/Catalyst.pm
Simple merge