]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Wed, 17 Aug 2016 14:52:32 +0000 (09:52 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 17 Aug 2016 14:52:32 +0000 (09:52 -0500)

Trivial merge