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

Trivial merge