Merge branch 'master' into next

Conflicts:
	Changelog.draft.rst
This commit is contained in:
Nicolas Sebrecht
2011-03-01 19:01:28 +01:00
2 changed files with 2 additions and 2 deletions

View File

@ -24,6 +24,7 @@ Bug Fixes
---------
* Allow SSL connections to send keep-alive messages.
* Fix regression (UIBase is no more).
Pending for the next major release