holger krekel fdd23878ec Merge latest changes from branch 'pytest-2.7' ... Conflicts: _pytest/__init__.py doc/en/fixture.rst setup.cfg testing/test_runner.py		2015-09-16 09:26:55 +02:00
..
en	Merge latest changes from branch 'pytest-2.7'	2015-09-16 09:26:55 +02:00