]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 25 May 2014 22:44:28 +0000 (18:44 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 25 May 2014 22:44:28 +0000 (18:44 -0400)

Trivial merge