]> granicus.if.org Git - python/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Fri, 20 Apr 2012 21:19:14 +0000 (17:19 -0400)
committerBrett Cannon <brett@python.org>
Fri, 20 Apr 2012 21:19:14 +0000 (17:19 -0400)

Trivial merge