]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 9 Apr 2012 19:05:23 +0000 (15:05 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 9 Apr 2012 19:05:23 +0000 (15:05 -0400)

Trivial merge