]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Thu, 4 Feb 2016 04:07:08 +0000 (22:07 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 4 Feb 2016 04:07:08 +0000 (22:07 -0600)

Trivial merge