Nicolas Sebrecht 94459f9454 Merge branch 'ns/fix-make-docs' into next
Conflicts:
	Changelog.draft.rst
2011-02-17 19:14:20 +01:00
..
2011-02-17 19:09:16 +01:00
2011-02-17 18:57:15 +01:00