Merge remote branch 'origin/rfc/illegal_options_for_inheritance'
authorShawn M Moore <sartak@bestpractical.com>
Sat, 24 Jul 2010 03:38:46 +0000 (23:38 -0400)
committerShawn M Moore <sartak@bestpractical.com>
Sat, 24 Jul 2010 03:38:46 +0000 (23:38 -0400)
commit13e0ee4c017cc00917e026d760a629b0adac6a00
tree44b8c0706c2d876529c6ddeb9c508babe70f1ee5
parentba945bf6674822054f5472d771ea2ea2c68571fe
parent7da75441fc8abe0e619137013e73052661e98102
Merge remote branch 'origin/rfc/illegal_options_for_inheritance'

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