commit 39f0551dc7d10de47c3c884d399d45abfa40501b Merge: 0d03ff8 c527097 Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Sat Mar 10 19:54:08 2012 +0000 Merge branch 'master' into el5 Conflicts: .gitignore perl-Test-Distribution.spec .gitignore | 2 +- nobranch | 1 - perl-Test-Distribution.spec | 41 +++++++++++++++++++++++++++++++++++++---- sources | 2 +- 4 files changed, 39 insertions(+), 7 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