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

[Nick Bebout]

commit c0646d65ec166c3dcc6b80cb9088a12e62a6b204
Merge: f52b60c 5e6e235
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue May 24 21:20:17 2011 -0500

    Merge branch 'master' into el4

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