]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 5 Aug 2012 22:05:53 +0000 (15:05 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 5 Aug 2012 22:05:53 +0000 (15:05 -0700)

Trivial merge