]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.6
authorZachary Ware <zachary.ware@gmail.com>
Wed, 26 Oct 2016 02:36:48 +0000 (21:36 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 26 Oct 2016 02:36:48 +0000 (21:36 -0500)

Trivial merge