]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Wed, 22 Jul 2015 03:50:43 +0000 (22:50 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 22 Jul 2015 03:50:43 +0000 (22:50 -0500)

Trivial merge