]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Sun, 16 Jun 2013 23:07:16 +0000 (19:07 -0400)
committerBrett Cannon <brett@python.org>
Sun, 16 Jun 2013 23:07:16 +0000 (19:07 -0400)

Trivial merge