]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Mon, 13 Oct 2014 15:55:02 +0000 (11:55 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 13 Oct 2014 15:55:02 +0000 (11:55 -0400)

Trivial merge