commit 350d315676b14170807c47145738e2eecf9a7d71 Merge: fdcd245 4ebe0d9 Author: Iain Arnell <iarnell@xxxxxxxxx> Date: Tue Oct 5 06:38:54 2010 +0200 Merge branch 'master' into f13 Conflicts: .gitignore perl-Test-Requires.spec sources .gitignore | 1 + perl-Test-Requires.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 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