commit 387bdaab7e6e9d2ed9ded402d06528749cdb672b Merge: 057e508 5315e1d Author: Nick Bebout <nb@xxxxxxxxxxxxxxxxx> Date: Mon Feb 21 14:20:08 2011 -0600 Merge branch 'master' into el5 Conflicts: .gitignore perl-Mail-IMAPClient.spec sources perl-Mail-IMAPClient.spec | 33 +++++++++++++++++++++++++++++++-- sources | 2 +- 2 files changed, 32 insertions(+), 3 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