]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Sun, 25 Oct 2015 04:27:03 +0000 (23:27 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Sun, 25 Oct 2015 04:27:03 +0000 (23:27 -0500)

Trivial merge