]> granicus.if.org Git - python/commitdiff
merge 3.3 (#20246)
authorBenjamin Peterson <benjamin@python.org>
Tue, 14 Jan 2014 04:14:58 +0000 (23:14 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 14 Jan 2014 04:14:58 +0000 (23:14 -0500)

Trivial merge