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

[Nick Bebout]

commit 05f2348725b1d601f177cc4b0a9fbee2dd2c2b8c
Merge: 3b0b650 85b074f
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Jul 11 21:38:26 2011 -0500

    Merge branch 'master' into el6

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