]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 1 Apr 2012 22:48:11 +0000 (18:48 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 1 Apr 2012 22:48:11 +0000 (18:48 -0400)

Trivial merge