]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #25097: Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Tue, 6 Oct 2015 20:23:16 +0000 (15:23 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 6 Oct 2015 20:23:16 +0000 (15:23 -0500)

Trivial merge