]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 6 Sep 2011 11:57:26 +0000 (07:57 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 6 Sep 2011 11:57:26 +0000 (07:57 -0400)

Trivial merge