[imapsync/el5: 2/2] Merge branch 'master' into el5

[Nick Bebout]

commit 4c359976726907846ff2e3eb5f29b7ba62407154
Merge: a214f3a 85b074f
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Jul 11 21:39:56 2011 -0500

    Merge branch 'master' into el5

 .gitignore    |    1 +
 imapsync.spec |   11 ++++++++++-
 sources       |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---