]> granicus.if.org Git - python/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Tue, 19 Nov 2013 16:06:44 +0000 (11:06 -0500)
committerAndrew Kuchling <amk@amk.ca>
Tue, 19 Nov 2013 16:06:44 +0000 (11:06 -0500)

Trivial merge