]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 16 Aug 2011 22:46:44 +0000 (17:46 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 16 Aug 2011 22:46:44 +0000 (17:46 -0500)

Trivial merge