]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Wed, 10 Jun 2015 05:44:40 +0000 (00:44 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 10 Jun 2015 05:44:40 +0000 (00:44 -0500)

Trivial merge