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

[Nick Bebout]

commit bef09582f6bce40079ac4ee67916c8f126df30b0
Merge: e9f46e8 3e9798a
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Oct 17 19:01:02 2013 -0500

    Merge branch 'master' into el6

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