]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 4 Jan 2013 04:34:40 +0000 (20:34 -0800)
committerBenjamin Peterson <benjamin@python.org>
Fri, 4 Jan 2013 04:34:40 +0000 (20:34 -0800)

Trivial merge