From ac2f2b1deb8cc416ff0cd45efb2419104df77b12 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Wed, 22 Jan 2014 21:50:07 +0100
Subject: [PATCH] add notes on the copied pylib version

---
 CHANGELOG               | 4 ++++
 _pytest/capture.py      | 2 ++
 testing/test_capture.py | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b0148b4f5..06bd353e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,10 @@ UNRELEASED
   correctly also on python2 and with pytest-xdist runs. (the fix
   requires py-1.4.20)
 
+- copy, cleanup and integrate py.io capture
+  from pylib 1.4.20.dev2 (rev 13d9af95547e)
+
+
 2.5.1
 -----------------------------------
 
diff --git a/_pytest/capture.py b/_pytest/capture.py
index b1e823284..efd0e6ee4 100644
--- a/_pytest/capture.py
+++ b/_pytest/capture.py
@@ -2,6 +2,8 @@
     per-test stdout/stderr capturing mechanisms,
     ``capsys`` and ``capfd`` function arguments.
 """
+# note: py.io capture was where copied from
+# pylib 1.4.20.dev2 (rev 13d9af95547e)
 import sys
 import os
 import tempfile
diff --git a/testing/test_capture.py b/testing/test_capture.py
index 5cd21b209..9ffe7a790 100644
--- a/testing/test_capture.py
+++ b/testing/test_capture.py
@@ -1,3 +1,5 @@
+# note: py.io capture tests where copied from
+# pylib 1.4.20.dev2 (rev 13d9af95547e)
 from __future__ import with_statement
 import os
 import sys