]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorZachary Ware <zachary.ware@gmail.com>
Wed, 17 Jun 2015 15:08:57 +0000 (10:08 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 17 Jun 2015 15:08:57 +0000 (10:08 -0500)

Trivial merge