]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 7 Apr 2013 13:53:49 +0000 (09:53 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 7 Apr 2013 13:53:49 +0000 (09:53 -0400)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge