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

[Nick Bebout]

commit 07f363c2af098be356e5cf753c26abbc2f486c60
Merge: 8213600 c432b87
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Jan 17 13:01:55 2013 -0600

    Merge branch 'master' into el6

 .gitignore             |    1 +
 README-license.patch   |   23 +++++++++++++++++++++++
 imapsync-license.patch |   32 ++++++++++++++++++++++++++++++++
 imapsync.spec          |   11 ++++++++++-
 sources                |    2 +-
 5 files changed, 67 insertions(+), 2 deletions(-)
---