]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Closes #24962: Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Sun, 30 Aug 2015 03:27:12 +0000 (22:27 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Sun, 30 Aug 2015 03:27:12 +0000 (22:27 -0500)

Trivial merge