Merge branch 'master' into attribute_helpers
authorDave Rolsky <autarch@urth.org>
Fri, 26 Jun 2009 21:05:02 +0000 (16:05 -0500)
committerDave Rolsky <autarch@urth.org>
Fri, 26 Jun 2009 21:05:02 +0000 (16:05 -0500)
commit7d4d7d1dbef7731d1b20eb7b18998be118792384
tree3f088982319076a8483f0f701968e0cf89c7fe83
parent6c83959442f106783570ceccfe82ad98869b2c1e
parent5ef36adde3d619733607b9f5f1136524a00848df
Merge branch 'master' into attribute_helpers

Conflicts:
Changes
Changes
lib/Moose.pm
lib/Moose/Meta/Attribute.pm
lib/Moose/Meta/Method/Delegation.pm