]> granicus.if.org Git - python/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Sun, 18 Aug 2013 22:58:27 +0000 (18:58 -0400)
committerAndrew Kuchling <amk@amk.ca>
Sun, 18 Aug 2013 22:58:27 +0000 (18:58 -0400)

Trivial merge