]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorTrent Nelson <trent@trent.me>
Tue, 16 Oct 2012 11:48:34 +0000 (07:48 -0400)
committerTrent Nelson <trent@trent.me>
Tue, 16 Oct 2012 11:48:34 +0000 (07:48 -0400)

Trivial merge