[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/da8e8e28a616
changeset:   88539:da8e8e28a616
parent:      88537:0d3783d50f6a
parent:      88538:eb91a9450eb1
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jan 18 00:49:30 2014 -0500
summary:
  merge 3.3

files:
  Doc/library/subprocess.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -729,7 +729,7 @@
    output from the child process. If the *universal_newlines* argument was
    ``True``, the stream is a text stream, otherwise it is a byte stream. If the
    *stdout* argument was not :data:`PIPE`, this attribute is ``None``.
-               
+
 
 .. attribute:: Popen.stderr
 

-- 
Repository URL: http://hg.python.org/cpython