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

[Nick Bebout]

commit c7a9b220765aec39a6c153a1530e5c6a46670e56
Merge: 677b55c 94c9d65
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Apr 16 23:01:23 2012 -0500

    Merge branch 'master' into el6

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