Merge branch 'ns/keep-2.5-compatibility' into next

Conflicts:
	Changelog.draft.rst

Changelog.draft.rst

@@ -21,6 +21,7 @@ Bug Fixes
 
 * Fix craches for getglobalui().
 * Fix documentation build.
+* Restore compatibiliy with python 2.5.
 
 
 Pending for the next major release

offlineimap/ui/TTY.py

@@ -37,7 +37,10 @@ class TTYUI(UIBase):
             #if the next output comes from a different thread than our last one
             #add the info.
             #Most look like 'account sync foo' or 'Folder sync foo'.
+            try:
                 threadname = currentThread().name
+            except AttributeError:
+                threadname = currentThread().getName()
             if (threadname == s._lastThreaddisplay):
                 print " %s" % msg
             else: