]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge doc changes from 3.2 (#10454, #12298)
authorÉric Araujo <merwok@netwok.org>
Thu, 1 Sep 2011 22:03:20 +0000 (00:03 +0200)
committerÉric Araujo <merwok@netwok.org>
Thu, 1 Sep 2011 22:03:20 +0000 (00:03 +0200)
1  2 
Doc/library/stdtypes.rst
Lib/pipes.py

Simple merge
diff --cc Lib/pipes.py
Simple merge