]> granicus.if.org Git - python/commitdiff
merge from 3.3
authorBrett Cannon <brett@python.org>
Fri, 1 Feb 2013 21:39:50 +0000 (16:39 -0500)
committerBrett Cannon <brett@python.org>
Fri, 1 Feb 2013 21:39:50 +0000 (16:39 -0500)

Trivial merge