]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 16 Oct 2012 13:52:02 +0000 (09:52 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 16 Oct 2012 13:52:02 +0000 (09:52 -0400)

Trivial merge