]> granicus.if.org Git - python/commitdiff
Closes #21346: Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Thu, 24 Apr 2014 18:22:47 +0000 (13:22 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 24 Apr 2014 18:22:47 +0000 (13:22 -0500)

Trivial merge