commit de52b2585bd37928a9d0e7ccf5339cbe640c4929 Merge: 999b90c ac8a99c Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Sat Apr 30 10:00:31 2011 +0100 Merge branch 'master' into el6 Conflicts: .gitignore perl-Test-NoTabs.spec sources .gitignore | 2 +- perl-Test-NoTabs.spec | 19 +++++++++++++++---- sources | 2 +- 3 files changed, 17 insertions(+), 6 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