commit 34a5fcf34b7d760d9dfd339f92c680e076c5316f Merge: a497ff9 44234e4 Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Sat Feb 19 10:14:11 2011 +0000 Merge el4 and el5 branches together Conflicts: .gitignore .gitignore | 2 +- 1 files changed, 1 insertions(+), 1 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