]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 13 Oct 2012 15:58:23 +0000 (11:58 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 13 Oct 2012 15:58:23 +0000 (11:58 -0400)

Trivial merge