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

[Nick Bebout]

commit 12d7cd49aeb6995138b5f44500860e9b30cd3eb1
Merge: 05f2348 0d9cc9a
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 8 20:46:24 2011 -0500

    Merge branch 'master' into el6

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