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

[Nick Bebout]

commit 0f873fc56a30bb53d49e0b5355976cd1e325d5c4
Merge: 8e6558e d6b7173
Author: Nick Bebout <nb at desktop.bebout.pro>
Date:   Tue May 31 20:54:10 2011 -0500

    Merge branch 'master' into f13

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