]> granicus.if.org Git - python/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Tue, 12 Nov 2013 15:26:15 +0000 (10:26 -0500)
committerAndrew Kuchling <amk@amk.ca>
Tue, 12 Nov 2013 15:26:15 +0000 (10:26 -0500)

Trivial merge