]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorZachary Ware <zachary.ware@gmail.com>
Tue, 7 Jul 2015 05:00:43 +0000 (00:00 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 7 Jul 2015 05:00:43 +0000 (00:00 -0500)

Trivial merge