]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 30 May 2011 16:15:05 +0000 (11:15 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 30 May 2011 16:15:05 +0000 (11:15 -0500)

Trivial merge