]> granicus.if.org Git - python/commitdiff
Issue #21829: Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Thu, 26 Jun 2014 20:22:16 +0000 (15:22 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 26 Jun 2014 20:22:16 +0000 (15:22 -0500)

Trivial merge