]> granicus.if.org Git - python/commitdiff
#17700: merge with 3.3
authorAndrew Kuchling <amk@amk.ca>
Fri, 10 May 2013 00:14:01 +0000 (20:14 -0400)
committerAndrew Kuchling <amk@amk.ca>
Fri, 10 May 2013 00:14:01 +0000 (20:14 -0400)

Trivial merge