]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 12 Oct 2012 16:05:01 +0000 (12:05 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 12 Oct 2012 16:05:01 +0000 (12:05 -0400)

Trivial merge