]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Tue, 30 Aug 2016 15:03:32 +0000 (10:03 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 30 Aug 2016 15:03:32 +0000 (10:03 -0500)

Trivial merge