Merge branch 'expand_modules'
Florian Ragwitz [Thu, 4 Feb 2010 05:50:05 +0000 (05:50 +0000)]
expand_modules:
Allow models and components to specify the names of any components they generate
Branching to allow components to specify any modules they may have created

1  2 
lib/Catalyst.pm
lib/Catalyst/Component.pm

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