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

[Nick Bebout]

commit 5a7d2341fc68333795dca587df71f130eda91065
Merge: 07f363c 6d9a35b
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Jan 17 13:19:00 2013 -0600

    Merge branch 'master' into el6

 imapsync.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---