]> 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: 57ffa9d f78869e)
#13289: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 29 Oct 2011 07:44:59 +0000 (10:44 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 29 Oct 2011 07:44:59 +0000 (10:44 +0300)
1  2 
Lib/socketserver.py patch | diff1 | diff2 | blob | history

diff --cc Lib/socketserver.py
Simple merge
Mirror of https://github.com/python/cpython.git