]> granicus.if.org Git - python/commitdiff
merge 3.3 (closes #12704)
authorBenjamin Peterson <benjamin@python.org>
Mon, 27 Jan 2014 03:58:42 +0000 (22:58 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 27 Jan 2014 03:58:42 +0000 (22:58 -0500)

Trivial merge