Merge branch 'master' into traits
authorJesse Luehrs <doy@tozt.net>
Mon, 1 Jun 2009 23:52:01 +0000 (18:52 -0500)
committerJesse Luehrs <doy@tozt.net>
Mon, 1 Jun 2009 23:52:01 +0000 (18:52 -0500)
commit4a35a0ad2542b236a6ea02022d55c4193a58a321
treec735c2b4613ec88ac80342127bcbdb64bc3bab8a
parentdbd51f3079bc5debaa79062c558ac4f47e8d374b
parentd071f896e163e4f4d15cc79e08a62d68cdfb05b9
Merge branch 'master' into traits

Conflicts:
lib/MooseX/AttributeHelpers/Trait/Base.pm
lib/MooseX/AttributeHelpers.pm
lib/MooseX/AttributeHelpers/Collection/Array.pm
lib/MooseX/AttributeHelpers/Collection/Bag.pm
lib/MooseX/AttributeHelpers/Collection/Hash.pm
lib/MooseX/AttributeHelpers/Collection/ImmutableHash.pm
lib/MooseX/AttributeHelpers/Collection/List.pm
lib/MooseX/AttributeHelpers/Counter.pm
lib/MooseX/AttributeHelpers/Number.pm
lib/MooseX/AttributeHelpers/String.pm
lib/MooseX/AttributeHelpers/Trait/Base.pm
lib/MooseX/AttributeHelpers/Trait/Collection.pm