]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Sun, 28 Oct 2012 15:49:00 +0000 (11:49 -0400)
committerBrett Cannon <brett@python.org>
Sun, 28 Oct 2012 15:49:00 +0000 (11:49 -0400)

Trivial merge