[uw-imap/el4: 4/4] Merge remote-tracking branch 'origin/el6' into el4

[Rex Dieter]

commit 387298b9e4a29b7aefd0367aca040eb632381af5
Merge: 24fc1b2 906363b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 3 00:01:40 2011 -0500

    Merge remote-tracking branch 'origin/el6' into el4

 .gitignore           |    2 +-
 imap-2007e-osx.patch |   12 ++++++++++++
 sources              |    2 +-
 uw-imap.spec         |   12 ++++++++----
 4 files changed, 22 insertions(+), 6 deletions(-)
---