Bruno Oliveira 1e0cf5ce4d Merge remote-tracking branch 'upstream/master' into merge-master-into-features ... # Conflicts: # AUTHORS # CHANGELOG.rst # _pytest/pytester.py		2017-03-10 15:54:05 -03:00
..
__init__.py	Refactored old style classes to new style classes	2017-01-08 22:52:42 -06:00
rewrite.py	Safer sys.modules delete	2017-02-14 16:54:32 -08:00
truncate.py	Restructure truncation of assertion messages	2016-10-10 23:38:27 +01:00
util.py	Merge remote-tracking branch 'upstream/master' into features	2016-09-26 19:32:53 -03:00