]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Fri, 17 Oct 2014 19:24:43 +0000 (14:24 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Fri, 17 Oct 2014 19:24:43 +0000 (14:24 -0500)

Trivial merge