]> granicus.if.org Git - python/commitdiff
Merge with 3.4 #3068
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 23 Oct 2014 00:16:17 +0000 (20:16 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 23 Oct 2014 00:16:17 +0000 (20:16 -0400)

Trivial merge