]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 16 Oct 2012 13:52:02 +0000 (09:52 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 16 Oct 2012 13:52:02 +0000 (09:52 -0400)

Trivial merge