]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 18 Dec 2015 20:47:13 +0000 (15:47 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 18 Dec 2015 20:47:13 +0000 (15:47 -0500)

Trivial merge