]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 22 Nov 2013 19:53:07 +0000 (14:53 -0500)
committerBrett Cannon <brett@python.org>
Fri, 22 Nov 2013 19:53:07 +0000 (14:53 -0500)

Trivial merge