]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 31 Oct 2012 23:02:18 +0000 (19:02 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 31 Oct 2012 23:02:18 +0000 (19:02 -0400)

Trivial merge