]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorLarry Hastings <larry@hastings.org>
Sun, 8 Feb 2015 22:07:35 +0000 (14:07 -0800)
committerLarry Hastings <larry@hastings.org>
Sun, 8 Feb 2015 22:07:35 +0000 (14:07 -0800)

Trivial merge