Merge branch 'master' into next

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

View File

@ -22,6 +22,7 @@ Bug Fixes
---------
* Makefile: docutils: work whether python extension is stripped or not
* accord __version__ with import
Pending for the next major release