]> granicus.if.org Git - python/commitdiff
Merged
authorBarry Warsaw <barry@python.org>
Fri, 7 Oct 2011 19:16:20 +0000 (15:16 -0400)
committerBarry Warsaw <barry@python.org>
Fri, 7 Oct 2011 19:16:20 +0000 (15:16 -0400)

Trivial merge