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

Conflicts:
	Changelog.draft.rst
This commit is contained in:
Nicolas Sebrecht
2011-02-21 11:47:42 +01:00
2 changed files with 5 additions and 1 deletions

View File

@ -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