]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 27 Sep 2015 08:40:23 +0000 (04:40 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 27 Sep 2015 08:40:23 +0000 (04:40 -0400)

Trivial merge