Merge branch 'master' into next

Conflicts: Changelog.draft.rst
2011-05-05 21:16:02 +02:00
parent f3774343db f2ad4bc230
commit c6259fbb86
4 changed files with 12 additions and 5 deletions
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@ -33,6 +33,7 @@ Bug Fixes

 * Drop connection if synchronisation failed. This is needed if resuming the
  system from suspend mode gives a wrong connection.
+* Fix the offlineimap crash when invoking debug option 'thread'


 Pending for the next major release