[imapsync/f12/master: 13/13] Merge branch 'f13' into f12

[Nick Bebout]

commit afb94fc13fc8d84e9714c1fd45eb3d6a4e875b6c
Merge: 1a54e08 7a3eb65
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Aug 10 21:58:34 2010 -0400

    Merge branch 'f13' into f12
    
    Conflicts:
    	.gitignore
    	imapsync.spec
    	sources

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