]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Wed, 13 Mar 2013 18:02:29 +0000 (11:02 -0700)
committerBrett Cannon <brett@python.org>
Wed, 13 Mar 2013 18:02:29 +0000 (11:02 -0700)

Trivial merge