]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Wed, 9 Dec 2015 08:03:18 +0000 (02:03 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 9 Dec 2015 08:03:18 +0000 (02:03 -0600)

Trivial merge