]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 25 Oct 2013 19:45:42 +0000 (15:45 -0400)
committerBrett Cannon <brett@python.org>
Fri, 25 Oct 2013 19:45:42 +0000 (15:45 -0400)

Trivial merge