]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 3 Aug 2015 22:42:40 +0000 (18:42 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 3 Aug 2015 22:42:40 +0000 (18:42 -0400)

Trivial merge