Merge branch 'master' into next

Changelog.draft.rst

@@ -19,6 +19,7 @@ Changes
 Bug Fixes
 ---------
 
+
 Pending for the next major release
 ==================================
 

Changelog.maint.rst

@@ -0,0 +1,24 @@
+=========
+ChangeLog
+=========
+
+:website: http://offlineimap.org
+
+This is the Changelog of the maintenance branch.
+
+**NOTE FROM THE MAINTAINER:**
+  Contributors should use the `WIP` section in Changelog.draft.rst in order to
+  add changes they are working on. I will use it to make the new changelog entry
+  on releases. And because I'm lazy, it will also be used as a draft for the
+  releases announces.
+
+
+OfflineIMAP v6.3.2.1 (2011-03-23)
+=================================
+
+Bug Fixes
+---------
+
+* Sanity checks for SSL cacertfile configuration.
+* Fix regression (UIBase is no more).
+* Make profiling mode really enforce single-threading.

offlineimap/accounts.py

@@ -363,4 +363,5 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
         raise
     except:
         ui.warn("ERROR in syncfolder for %s folder %s: %s" % \
-                (accountname,remotefolder.getvisiblename(),sys.exc_info()[1]))
+                (accountname,remotefolder.getvisiblename(),
+                 traceback.format_exc()))