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

[Nick Bebout]

commit 9641b659d2243ee6e6d01fc215d61b7da1bc08c6
Merge: 4775fc2 94c9d65
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Apr 16 23:01:36 2012 -0500

    Merge branch 'master' into el5

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