commit 9a46cd4459a6f8713694bd29ce342057effe8b83 Merge: fcf9299 4aafbd9 Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Mon Apr 18 14:31:17 2011 +0100 Merge branch 'el6' into el5 Conflicts: .gitignore perl-Module-Signature.spec sources .gitignore | 2 +- perl-Module-Signature.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 5 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