Nicolas Sebrecht c6259fbb86 Merge branch 'master' into next
Conflicts:
	Changelog.draft.rst
2011-05-05 21:16:02 +02:00
..
2008-01-03 04:56:55 +01:00
2011-04-27 19:07:09 +02:00
2011-03-14 19:51:52 +01:00
2011-05-05 21:16:02 +02:00