Merge branch 'master' into next

Conflicts: Changelog.draft.rst
2011-01-28 19:48:35 +01:00
parent 2e1983d5ef 9afb432053
commit 84b7c686ec
2 changed files with 2 additions and 1 deletions
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@ -234,7 +234,7 @@ class IMAPFolder(BaseFolder):
        headervalue += binascii.hexlify(self.getname())
        headervalue += '-%d-' % long(time.time())
        headervalue += str(self.randomgenerator.random()).replace('.', '')
-        headervalue += '-v' + offlineimap.__version__
+        headervalue += '-v' + __version__
        return (headername, headervalue)

    def savemessage_addheader(self, content, headername, headervalue):