commit 3e520cfac4bcc01674cc6bbaa3f557e5ea7b2ae4 Merge: d05af50 5315e1d Author: Nick Bebout <nb@xxxxxxxxxxxxxxxxx> Date: Mon Feb 21 14:17:44 2011 -0600 Merge branch 'master' into f13 Conflicts: .gitignore .gitignore | 2 +- perl-Mail-IMAPClient.spec | 29 ++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 28 insertions(+), 5 deletions(-) --- diff --cc .gitignore index 0650f07,5b6cb57..97d038a --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,2 +1,1 @@@ - Mail-IMAPClient-3.21.tar.gz -Mail-IMAPClient-3.25.tar.gz -/Mail-IMAPClient-3.27.tar.gz ++Mail-IMAPClient-3.27.tar.gz -- 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