]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Thu, 26 Apr 2012 00:18:24 +0000 (20:18 -0400)
committerBrett Cannon <brett@python.org>
Thu, 26 Apr 2012 00:18:24 +0000 (20:18 -0400)

Trivial merge