]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 10 Oct 2013 21:40:48 +0000 (17:40 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 10 Oct 2013 21:40:48 +0000 (17:40 -0400)

Trivial merge