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

Trivial merge