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

Trivial merge