]> granicus.if.org Git - python/commitdiff
merge
authorBrett Cannon <brett@python.org>
Fri, 11 Jan 2013 20:43:34 +0000 (15:43 -0500)
committerBrett Cannon <brett@python.org>
Fri, 11 Jan 2013 20:43:34 +0000 (15:43 -0500)

Trivial merge