]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3ac50b a8d7037)
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 3 Jan 2012 22:26:34 +0000 (16:26 -0600)
committerBenjamin Peterson <benjamin@python.org>
Tue, 3 Jan 2012 22:26:34 +0000 (16:26 -0600)
1  2 
Doc/library/socketserver.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/socketserver.rst
Simple merge
Mirror of https://github.com/python/cpython.git