Merge branch 'maint'

Conflicts:
	Changelog.draft.rst
	Makefile
This commit is contained in:
Nicolas Sebrecht
2011-03-24 19:07:34 +01:00
3 changed files with 27 additions and 1 deletions

View File

@ -19,6 +19,7 @@ Changes
Bug Fixes
---------
Pending for the next major release
==================================