]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Fri, 21 Jun 2013 12:07:35 +0000 (08:07 -0400)
committerAndrew Kuchling <amk@amk.ca>
Fri, 21 Jun 2013 12:07:35 +0000 (08:07 -0400)

Trivial merge