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

[Nick Bebout]

commit 75bcecaae762ef36b1c34f4593b2c5c0c2a91fbd
Merge: 8d9e71b 7d0c95d
Author: Nick Bebout <nb at desktop.bebout.net>
Date:   Mon Sep 10 08:58:20 2012 -0500

    Merge branch 'master' into el6

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