2 Commits

Author	SHA1	Message	Date
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
Abhijeet Kasurde	e79413acc4	Updated documentation from txt to rst ... Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>	2015-08-04 16:41:02 +05:30