]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorLarry Hastings <larry@hastings.org>
Sun, 8 Mar 2015 08:57:04 +0000 (00:57 -0800)
committerLarry Hastings <larry@hastings.org>
Sun, 8 Mar 2015 08:57:04 +0000 (00:57 -0800)

Trivial merge