]> granicus.if.org Git - python/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Sun, 16 Feb 2014 17:18:17 +0000 (12:18 -0500)
committerAndrew Kuchling <amk@amk.ca>
Sun, 16 Feb 2014 17:18:17 +0000 (12:18 -0500)

Trivial merge