]> granicus.if.org Git - python/commitdiff
Closes #22178: Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Mon, 11 Aug 2014 20:01:28 +0000 (15:01 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Mon, 11 Aug 2014 20:01:28 +0000 (15:01 -0500)

Trivial merge