]> granicus.if.org Git - python/commitdiff
Closes #23932: Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Mon, 13 Apr 2015 16:32:01 +0000 (11:32 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Mon, 13 Apr 2015 16:32:01 +0000 (11:32 -0500)

Trivial merge