From 040062e40cd369b4b748e188d82a03caaee39dd3 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 19 May 2014 20:32:09 +0200
Subject: [PATCH] improve example for pytest integration with "python setup.py
 test" which now has a generic "-a" or "--pytest-args" option where you can
 pass additional options as a quoted string.  Thanks Trevor Bekolay.

---
 AUTHORS   | 1 +
 CHANGELOG | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index d3cae6a40..dcd81f56d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,3 +42,4 @@ Marc Schlaich
 Christopher Gilling
 Daniel Grana
 Andy Freeland
+Trevor Bekolay
diff --git a/CHANGELOG b/CHANGELOG
index 265b6994d..74e2ebae3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,6 +57,10 @@ NEXT (2.6)
 
 - fix issue483: trial/py33 works now properly.  Thanks Daniel Grana for PR.
 
+- improve example for pytest integration with "python setup.py test"
+  which now has a generic "-a" or "--pytest-args" option where you
+  can pass additional options as a quoted string.  Thanks Trevor Bekolay.
+
 - simplified internal capturing mechanism and made it more robust
   against tests or setups changing FD1/FD2, also better integrated
   now with pytest.pdb() in single tests.