]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 11 Sep 2012 16:05:18 +0000 (12:05 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 11 Sep 2012 16:05:18 +0000 (12:05 -0400)

Trivial merge