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

[Nick Bebout]

commit 2441a95b5ca5b84b82ba931d5c41974aa6afff6a
Merge: fa44a5d 1d726bd
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Nov 26 21:51:59 2014 -0600

    Merge branch 'master' into el6

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