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

[Rex Dieter]

commit e17b409ec5296c5ea1e18486978d84b1dcc99bd3
Merge: b1cad16 906363b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 2 23:55:54 2011 -0500

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

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