Merge branch 'master' into role-methods
authorShawn M Moore <sartak@gmail.com>
Sun, 31 May 2009 02:49:31 +0000 (22:49 -0400)
committerShawn M Moore <sartak@gmail.com>
Sun, 31 May 2009 02:49:31 +0000 (22:49 -0400)
commit2afa57404163819638a36f2e45abeb384b6ebce7
treedc39b5aa5117bb629513c9ac99d4c9af81dc3d65
parent44ed889183b81ea8777d2b7ffef8c4ef90d31f22
parent8b3d8d4d276c742089dd8a68f691137e6aced156
Merge branch 'master' into role-methods

Conflicts:
lib/Moose/Meta/Role.pm