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

[Nick Bebout]

commit ec768512d0758e6298acc3036fafb30dfb80ed6d
Merge: 71745c8 949e455
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 13 17:31:54 2011 -0600

    Merge branch 'master' into el5

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