]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sat, 24 Dec 2011 02:02:12 +0000 (20:02 -0600)
committerBenjamin Peterson <benjamin@python.org>
Sat, 24 Dec 2011 02:02:12 +0000 (20:02 -0600)

Trivial merge