Bruno Oliveira b30a6d22c5 Merge branch 'master' into merge-master-into-features		2016-11-27 17:30:40 -02:00
..
__init__.py	Merge pull request #2075 from pytest-dev/master	2016-11-22 14:10:31 -02:00
rewrite.py	Merge pull request #2070 from nedbat/bug2038	2016-11-22 17:45:29 +01: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