Merge branch 'ns/init-remove-uneeded-import' into next

Conflicts: Changelog.draft.rst
2011-01-28 19:53:23 +01:00
parent 84b7c686ec c8726fe472
commit 5660bacc5b
2 changed files with 1 additions and 2 deletions
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -17,12 +17,12 @@ Changes
 -------

 * have --version ONLY print the version number
+* Code cleanups.

 Bug Fixes
 ---------

 * Makefile: docutils: work whether python extension is stripped or not
-* accord __version__ with import


 Pending for the next major release