]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sun, 19 Oct 2014 14:47:58 +0000 (10:47 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 19 Oct 2014 14:47:58 +0000 (10:47 -0400)

Trivial merge