]> granicus.if.org Git - python/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Sat, 22 Jun 2013 23:27:59 +0000 (19:27 -0400)
committerAndrew Kuchling <amk@amk.ca>
Sat, 22 Jun 2013 23:27:59 +0000 (19:27 -0400)

Trivial merge