]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 12 Nov 2012 22:04:43 +0000 (17:04 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 12 Nov 2012 22:04:43 +0000 (17:04 -0500)

Trivial merge