]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.3
authorEli Bendersky <eliben@gmail.com>
Thu, 10 Jan 2013 14:36:07 +0000 (06:36 -0800)
committerEli Bendersky <eliben@gmail.com>
Thu, 10 Jan 2013 14:36:07 +0000 (06:36 -0800)

Trivial merge