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

Trivial merge