Bruno Oliveira df29120abe Merge branch 'pytest-2.7' ...

Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini

2015-07-23 22:35:51 -03:00

80 KiB

Raw Blame History

View Raw