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

[Nick Bebout]

commit 00f6056cf98e70e8f0763138036dc023ec939c90
Merge: 3519c22 85b074f
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Jul 11 21:40:26 2011 -0500

    Merge branch 'master' into el4

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