]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 24 Dec 2012 17:54:13 +0000 (11:54 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 24 Dec 2012 17:54:13 +0000 (11:54 -0600)

Trivial merge