]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 12 Mar 2012 16:28:26 +0000 (09:28 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 12 Mar 2012 16:28:26 +0000 (09:28 -0700)

Trivial merge