]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Fri, 1 Jan 2016 18:24:12 +0000 (12:24 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Fri, 1 Jan 2016 18:24:12 +0000 (12:24 -0600)

Trivial merge