]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorR David Murray <rdmurray@bitdance.com>
Sun, 23 Jun 2013 20:12:32 +0000 (16:12 -0400)
committerR David Murray <rdmurray@bitdance.com>
Sun, 23 Jun 2013 20:12:32 +0000 (16:12 -0400)

Trivial merge