]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorTrent Nelson <trent@trent.me>
Wed, 17 Oct 2012 22:08:16 +0000 (18:08 -0400)
committerTrent Nelson <trent@trent.me>
Wed, 17 Oct 2012 22:08:16 +0000 (18:08 -0400)

Trivial merge