holger krekel ee40ea5f6d Merge branch 'pytest-2.7' ... Conflicts: AUTHORS _pytest/__init__.py setup.py testing/conftest.py tox.ini		2015-06-23 16:49:05 +02:00
..
en	Merge branch 'pytest-2.7'	2015-06-23 16:49:05 +02:00