]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #25934: Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Sat, 30 Jan 2016 01:09:41 +0000 (19:09 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Sat, 30 Jan 2016 01:09:41 +0000 (19:09 -0600)

Trivial merge