]> granicus.if.org Git - python/commitdiff
Merge with 3.3
authorBrett Cannon <brett@python.org>
Sun, 28 Oct 2012 15:47:54 +0000 (11:47 -0400)
committerBrett Cannon <brett@python.org>
Sun, 28 Oct 2012 15:47:54 +0000 (11:47 -0400)

Trivial merge