]> granicus.if.org Git - python/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Fri, 21 Jun 2013 01:40:14 +0000 (21:40 -0400)
committerAndrew Kuchling <amk@amk.ca>
Fri, 21 Jun 2013 01:40:14 +0000 (21:40 -0400)

Trivial merge