]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.2 #12510
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 3 Jun 2012 05:06:38 +0000 (01:06 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 3 Jun 2012 05:06:38 +0000 (01:06 -0400)

Trivial merge