]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 15 Mar 2011 20:08:34 +0000 (15:08 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 15 Mar 2011 20:08:34 +0000 (15:08 -0500)

Trivial merge