]> granicus.if.org Git - python/commitdiff
Closes #24974: Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Thu, 3 Sep 2015 16:54:51 +0000 (11:54 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 3 Sep 2015 16:54:51 +0000 (11:54 -0500)

Trivial merge