Merge branch 'master' into gsoc_breadboard
André Walker [Tue, 20 Sep 2011 14:24:04 +0000 (11:24 -0300)]
1  2 
lib/Catalyst.pm

diff --cc lib/Catalyst.pm
Simple merge