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

[Nick Bebout]

commit ec1f198503554075dbffdbc101eecf84d28d0aef
Merge: 49fa306 949e455
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 13 17:31:57 2011 -0600

    Merge branch 'master' into el4

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