Bruno Oliveira f3b359f5b8 Merge remote-tracking branch 'upstream/master' into merge-master-into-features ... # Conflicts: # _pytest/capture.py # _pytest/compat.py # _pytest/python.py # testing/python/collect.py # testing/test_mark.py		2017-05-03 19:04:53 -03:00
..
en	Merge remote-tracking branch 'upstream/master' into merge-master-into-features	2017-05-03 19:04:53 -03:00