]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4: decolourize
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 9 Oct 2014 22:45:07 +0000 (18:45 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 9 Oct 2014 22:45:07 +0000 (18:45 -0400)

Trivial merge