]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Thu, 27 Nov 2014 05:56:10 +0000 (23:56 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 27 Nov 2014 05:56:10 +0000 (23:56 -0600)

Trivial merge