Merge branch 'master' into features

Conflicts:
	AUTHORS
	_pytest/__init__.py
	_pytest/hookspec.py
	_pytest/recwarn.py
	testing/test_recwarn.py

doc/en/skipping.rst

@@ -93,8 +93,8 @@ As with all function :ref:`marking <mark>` you can skip test functions at the
 `whole class- or module level`_.  If your code targets python2.6 or above you
 use the skipif decorator (and any other marker) on classes::
 
-    @pytest.mark.skipif(sys.platform != 'win32',
-                        reason="requires windows")
+    @pytest.mark.skipif(sys.platform == 'win32',
+                        reason="does not run on windows")
     class TestPosixCalls:
 
         def test_function(self):
@@ -107,8 +107,8 @@ If your code targets python2.5 where class-decorators are not available,
 you can set the ``pytestmark`` attribute of a class::
 
     class TestPosixCalls:
-        pytestmark = pytest.mark.skipif(sys.platform != 'win32',
-                                        reason="requires Windows")
+        pytestmark = pytest.mark.skipif(sys.platform == 'win32',
+                                        reason="does not run on windows")
 
         def test_function(self):
             "will not be setup or run under 'win32' platform"
@@ -175,7 +175,7 @@ Running it with the report-on-xfail option gives this output::
 
     example $ py.test -rx xfail_demo.py
     ======= test session starts ========
-    platform linux -- Python 3.4.3, pytest-2.8.1, py-1.4.30, pluggy-0.3.1
+    platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
     rootdir: $REGENDOC_TMPDIR/example, inifile: 
     collected 7 items