]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Tue, 19 Apr 2016 16:49:56 +0000 (11:49 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 19 Apr 2016 16:49:56 +0000 (11:49 -0500)

Trivial merge