]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 18 Aug 2015 17:27:18 +0000 (13:27 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 18 Aug 2015 17:27:18 +0000 (13:27 -0400)

Trivial merge