]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Tue, 2 Feb 2016 23:04:56 +0000 (17:04 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 2 Feb 2016 23:04:56 +0000 (17:04 -0600)

Trivial merge