]> granicus.if.org Git - python/commitdiff
Closes #24947: Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Thu, 27 Aug 2015 20:55:48 +0000 (15:55 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 27 Aug 2015 20:55:48 +0000 (15:55 -0500)

Trivial merge