Nicolas Sebrecht 51b89e6c43 Merge branch 'maint'
Conflicts:
	Changelog.draft.rst
	Makefile
2011-03-24 19:07:34 +01:00
..
2011-03-16 20:46:18 +01:00
2011-03-24 19:07:34 +01:00
2011-03-14 19:51:56 +01:00
2011-03-14 19:51:56 +01:00
2006-08-12 05:15:55 +01:00
2006-08-12 05:15:55 +01:00