]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 23 May 2015 21:18:40 +0000 (17:18 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 23 May 2015 21:18:40 +0000 (17:18 -0400)

Trivial merge