]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorSteven D'Aprano <steve@pearwood.info>
Tue, 1 Dec 2015 14:10:09 +0000 (01:10 +1100)
committerSteven D'Aprano <steve@pearwood.info>
Tue, 1 Dec 2015 14:10:09 +0000 (01:10 +1100)

Trivial merge