]> granicus.if.org Git - python/commitdiff
Closes #24680: Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Wed, 22 Jul 2015 03:34:48 +0000 (22:34 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 22 Jul 2015 03:34:48 +0000 (22:34 -0500)

Trivial merge