[perl-Mail-IMAPClient/el6/master: 7/7] Merge branch 'master' into el6

commit 5b632aafc4b7ed560617d41fc0db9b5a161dcbfb Merge: 3463ca9 7b3b607 Author: Paul Howarth <paul(a)city-fan.org&gt; Date: Sat Oct 2 10:14:46 2010 +0100 Merge branch 'master' into el6 Conflicts: .gitignore perl-Mail-IMAPClient.spec .gitignore | 2 +- perl-Mail-IMAPClient.spec | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) --- diff --cc .gitignore index 0650f07,c68acd8..52352ef --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,1 +1,1 @@@ - Mail-IMAPClient-3.21.tar.gz -Mail-IMAPClient-3.25.tar.gz ++/Mail-IMAPClient-3.25.tar.gz