]> granicus.if.org Git - python/commitdiff
Closes #25800: Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Sat, 5 Dec 2015 06:19:08 +0000 (00:19 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Sat, 5 Dec 2015 06:19:08 +0000 (00:19 -0600)

Trivial merge