commit 6d8a1f2eb775802640dda4ae6b72044973567fed Merge: b46de7a 50a2245 Author: Nick Bebout <nb@xxxxxxxxxxxxxxxxxx> Date: Wed Mar 16 22:16:52 2011 -0500 Merge branch 'master' into el4 Conflicts: .gitignore perl-Mail-IMAPClient.spec sources .gitignore | 2 +- perl-Mail-IMAPClient.spec | 36 ++++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 36 insertions(+), 4 deletions(-) --- diff --cc .gitignore index b3407e4,be0936f..faea1c0 --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,3 +1,1 @@@ - Mail-IMAPClient-2.2.9.tar.gz -Mail-IMAPClient-3.25.tar.gz -/Mail-IMAPClient-3.27.tar.gz + /Mail-IMAPClient-3.28.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