commit a5942714dc603ac3f3aa76ebc9b2b3f8c785439d Merge: f88e0dd 6aa153a Author: Lubomir Rintel <lkundrak@xxxxx> Date: Mon Oct 27 18:56:50 2014 +0100 Merge remote-tracking branch 'origin/epel7' into el6 Conflicts: .gitignore .gitignore | 2 +- Net-Server-2.007-cert-verify.patch | 24 +++++++ perl-Net-Server.spec | 135 +++++++++++++++++++++++------------- sources | 2 +- 4 files changed, 113 insertions(+), 50 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