]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge for issue #12484
authorBrett Cannon <brett@python.org>
Sun, 27 Dec 2015 20:24:36 +0000 (12:24 -0800)
committerBrett Cannon <brett@python.org>
Sun, 27 Dec 2015 20:24:36 +0000 (12:24 -0800)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge