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

Trivial merge