]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 25 Sep 2012 15:23:09 +0000 (11:23 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 25 Sep 2012 15:23:09 +0000 (11:23 -0400)

Trivial merge