Merge branch 'master' into next

Conflicts:
	Changelog.draft.rst
	offlineimap/imapserver.py
This commit is contained in:
Nicolas Sebrecht
2011-03-07 21:55:43 +01:00
3 changed files with 11 additions and 1 deletions

View File

@ -33,6 +33,7 @@ Changes
Bug Fixes
---------
* Fix hang because of infinite loop reading EOF.
* Allow SSL connections to send keep-alive messages.
* Fix regression (UIBase is no more).
* Make profiling mode really enforce single-threading