Floris Bruynooghe 75740337d1 Merge pull request #2060 from pytest-dev/master ... Merge master into features due to recent CI updates		2016-11-13 18:18:38 -08:00
..
en	Merge pull request #2060 from pytest-dev/master	2016-11-13 18:18:38 -08:00