]> granicus.if.org Git - python/commitdiff
merge 3.3 (closes #20892)
authorBenjamin Peterson <benjamin@python.org>
Tue, 11 Mar 2014 18:59:48 +0000 (13:59 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 11 Mar 2014 18:59:48 +0000 (13:59 -0500)

Trivial merge