commit d1e810492a61fbe3e3a2de81c74823ce274e577d Merge: 5b632aa 5315e1d Author: Nick Bebout <nb@xxxxxxxxxxxxxxxxx> Date: Mon Feb 21 14:18:40 2011 -0600 Merge branch 'master' into el6 Conflicts: .gitignore .gitignore | 3 ++- perl-Mail-IMAPClient.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 5 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