]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
trunk merge
authorBarry Warsaw <barry@python.org>
Thu, 21 Nov 2013 23:57:41 +0000 (18:57 -0500)
committerBarry Warsaw <barry@python.org>
Thu, 21 Nov 2013 23:57:41 +0000 (18:57 -0500)

Trivial merge