]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 22 Jun 2014 05:20:52 +0000 (01:20 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 22 Jun 2014 05:20:52 +0000 (01:20 -0400)

Trivial merge