Buck Golemon eabf2f9091 Merge branch 'master' into features ... Conflicts: AUTHORS _pytest/__init__.py _pytest/hookspec.py _pytest/recwarn.py testing/test_recwarn.py		2015-12-07 14:28:59 -08:00
..
en	Merge branch 'master' into features	2015-12-07 14:28:59 -08:00