]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 9 Oct 2012 15:16:26 +0000 (11:16 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 9 Oct 2012 15:16:26 +0000 (11:16 -0400)

Trivial merge