]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 22 Nov 2013 21:14:24 +0000 (16:14 -0500)
committerBrett Cannon <brett@python.org>
Fri, 22 Nov 2013 21:14:24 +0000 (16:14 -0500)

Trivial merge