]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
null merge from 3.3
authorBenjamin Peterson <benjamin@python.org>
Fri, 10 Jan 2014 15:24:59 +0000 (09:24 -0600)
committerBenjamin Peterson <benjamin@python.org>
Fri, 10 Jan 2014 15:24:59 +0000 (09:24 -0600)

Trivial merge