]> granicus.if.org Git - python/commitdiff
Closes #15414: Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Fri, 10 Oct 2014 21:05:54 +0000 (16:05 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Fri, 10 Oct 2014 21:05:54 +0000 (16:05 -0500)

Trivial merge