]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Wed, 2 Sep 2015 20:01:42 +0000 (15:01 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 2 Sep 2015 20:01:42 +0000 (15:01 -0500)

Trivial merge