]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Thu, 12 Nov 2015 05:34:00 +0000 (23:34 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 12 Nov 2015 05:34:00 +0000 (23:34 -0600)

Trivial merge