]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 1 Aug 2012 04:50:11 +0000 (21:50 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 1 Aug 2012 04:50:11 +0000 (21:50 -0700)

Trivial merge