]> granicus.if.org Git - python/commitdiff
Closes #25093: Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Tue, 13 Oct 2015 04:31:44 +0000 (23:31 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 13 Oct 2015 04:31:44 +0000 (23:31 -0500)

Trivial merge