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

[Nick Bebout]

commit 640155902ca8ba92a641767b9bec9a5decc49a48
Merge: 12d7cd4 949e455
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 13 17:31:50 2011 -0600

    Merge branch 'master' into el6

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