]> granicus.if.org Git - python/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Thu, 20 Jun 2013 13:51:51 +0000 (09:51 -0400)
committerAndrew Kuchling <amk@amk.ca>
Thu, 20 Jun 2013 13:51:51 +0000 (09:51 -0400)

Trivial merge