]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Null merge from 3.3 branch.
authorTim Peters <tim@python.org>
Wed, 4 Dec 2013 03:33:31 +0000 (21:33 -0600)
committerTim Peters <tim@python.org>
Wed, 4 Dec 2013 03:33:31 +0000 (21:33 -0600)

Trivial merge