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

Trivial merge