]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 19 Dec 2012 21:17:43 +0000 (15:17 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 19 Dec 2012 21:17:43 +0000 (15:17 -0600)

Trivial merge