[offlineimap/f13/master: 5/5] Merge branch 'master' of ssh://pkgs.fedoraproject.org/offlineimap into f13/master

[Christoph Höger]

commit dc7b9e0c80f335e6e028edd0ac6b6587624c6313
Merge: ca86dca 06280c8
Author: Christoph Höger <choeger at cs.tu-berlin.de>
Date:   Sun Sep 19 16:43:17 2010 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/offlineimap into f13/master
    
    Conflicts:
    	.gitignore

 .gitignore                                     |    1 -
 fix-socket.ssl-deprecation-on-python-2.6.patch |   34 ------------------------
 offlineimap.spec                               |   10 ++++++-
 sources                                        |    2 +-
 4 files changed, 10 insertions(+), 37 deletions(-)
---