]> granicus.if.org Git - python/commitdiff
merge w/ 3.3
authorBrett Cannon <brett@python.org>
Sat, 4 May 2013 22:11:30 +0000 (18:11 -0400)
committerBrett Cannon <brett@python.org>
Sat, 4 May 2013 22:11:30 +0000 (18:11 -0400)

Trivial merge