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
..
en	Merge remote-tracking branch 'upstream/master' into merge-master-into-features	2017-03-10 15:54:05 -03:00