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

Trivial merge