Bruno Oliveira c2864aba3d Merge branch 'master' into merge-master ...

# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py

2016-07-25 19:06:29 -03:00

41 KiB

Raw Blame History

View Raw