]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 10 Oct 2012 18:10:44 +0000 (14:10 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 10 Oct 2012 18:10:44 +0000 (14:10 -0400)

Trivial merge