]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 20 Apr 2012 19:23:11 +0000 (15:23 -0400)
committerBrett Cannon <brett@python.org>
Fri, 20 Apr 2012 19:23:11 +0000 (15:23 -0400)

Trivial merge