]> granicus.if.org Git - python/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Mon, 3 Feb 2014 14:20:22 +0000 (09:20 -0500)
committerAndrew Kuchling <amk@amk.ca>
Mon, 3 Feb 2014 14:20:22 +0000 (09:20 -0500)

Trivial merge