]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Sat, 21 Apr 2012 22:53:14 +0000 (18:53 -0400)
committerBrett Cannon <brett@python.org>
Sat, 21 Apr 2012 22:53:14 +0000 (18:53 -0400)

Trivial merge