]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 2 Jan 2013 18:23:32 +0000 (12:23 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 2 Jan 2013 18:23:32 +0000 (12:23 -0600)

Trivial merge