]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 2 Sep 2012 18:25:18 +0000 (14:25 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 2 Sep 2012 18:25:18 +0000 (14:25 -0400)

Trivial merge