]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Wed, 14 Nov 2012 20:22:56 +0000 (15:22 -0500)
committerBrett Cannon <brett@python.org>
Wed, 14 Nov 2012 20:22:56 +0000 (15:22 -0500)

Trivial merge