commit e2d1829d5046c790e8dab7e49adc8981fbfec047 Merge: 8b58582 2ea0eda Author: Robert Scheck <robert@xxxxxxxxxxxxxxxxx> Date: Sun Oct 12 21:59:51 2014 +0200 Merge remote branch 'origin/master' into el5 Conflicts: .gitignore perl-Crypt-GPG.spec sources .gitignore | 2 +- perl-Crypt-GPG-1.64-gpg.patch | 15 +++++++++ perl-Crypt-GPG.spec | 69 ++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 4 files changed, 81 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