Merge branch 'master' into next

2013-07-10 02:49:52 +01:00
parent cbceffcb6a 05284b4df8
commit e8c40a9285
5 changed files with 86 additions and 78 deletions
--- a/offlineimap/folder/Base.py
+++ b/offlineimap/folder/Base.py
@ -367,7 +367,7 @@ class BaseFolder(object):
            raise
        except OfflineImapError as e:
            if e.severity > OfflineImapError.ERROR.MESSAGE:
-                raise # buble severe errors up
+                raise # bubble severe errors up
            self.ui.error(e, exc_info()[2])
        except Exception as e:
            self.ui.error(e, "Copying message %s [acc: %s]:\n %s" %\