]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 16 Jun 2011 23:51:24 +0000 (18:51 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 16 Jun 2011 23:51:24 +0000 (18:51 -0500)

Trivial merge