]> granicus.if.org Git - python/commitdiff
merge 3.3 (#6627)
authorBenjamin Peterson <benjamin@python.org>
Mon, 20 Jan 2014 05:12:24 +0000 (00:12 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 20 Jan 2014 05:12:24 +0000 (00:12 -0500)

Trivial merge