commit 5ac9f0065060e242cd5d61b707423530e07ea64e Merge: b5e38d8 d8001fa Author: Iain Arnell <iarnell@xxxxxxxxx> Date: Sat Aug 28 13:15:16 2010 +0200 Merge branch 'master' into el6 Conflicts: .gitignore perl-MooseX-MethodAttributes.spec sources .gitignore | 1 + perl-MooseX-MethodAttributes.spec | 30 ++++++++++++++++++++---------- sources | 2 +- 3 files changed, 22 insertions(+), 11 deletions(-) --- -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel