]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 11 Apr 2012 20:12:21 +0000 (16:12 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 11 Apr 2012 20:12:21 +0000 (16:12 -0400)

Trivial merge