]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 25 Sep 2015 03:14:02 +0000 (23:14 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 25 Sep 2015 03:14:02 +0000 (23:14 -0400)

Trivial merge