]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorBarry Warsaw <barry@python.org>
Mon, 11 Jan 2016 20:53:19 +0000 (15:53 -0500)
committerBarry Warsaw <barry@python.org>
Mon, 11 Jan 2016 20:53:19 +0000 (15:53 -0500)

Trivial merge