commit 055fb415e48caf61cb3c5bd17b973e0e0a55a678 Merge: be5829d 7e12e0a Author: Nick Bebout <nb at fedoraproject.org> Date: Sun Jul 28 16:31:25 2013 -0500 Merge branch 'master' into el6 .gitignore | 1 + imapsync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---