commit 6b0267664d206e436c160c2458210efe6cd355d2 Merge: 55b2f30 a4e70ce Author: Nick Bebout <nb@xxxxxxxxxxxxxxxxx> Date: Wed Apr 3 15:20:07 2013 -0500 Merge branch 'master' into el5 Conflicts: perl-Mail-SPF.spec .gitignore | 1 + perl-Mail-SPF.spec | 41 +++++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 35 insertions(+), 9 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