holger krekel d3b8390df3 Merge branch 'doc' of git+ssh://github.com/Turbo87/pytest into Turbo87-doc ... Conflicts: CHANGELOG		2013-12-17 06:49:12 +01:00
..
en	Merge branch 'doc' of git+ssh://github.com/Turbo87/pytest into Turbo87-doc	2013-12-17 06:49:12 +01:00
ja	add changelog entry for anthon's hynek-fication of options,	2013-08-01 17:32:19 +02:00