]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Closes #25767: Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Tue, 1 Dec 2015 04:57:22 +0000 (22:57 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 1 Dec 2015 04:57:22 +0000 (22:57 -0600)

Trivial merge