]> granicus.if.org Git - python/commitdiff
merge 3.3 (#20080)
authorBenjamin Peterson <benjamin@python.org>
Sat, 15 Feb 2014 18:20:28 +0000 (13:20 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 15 Feb 2014 18:20:28 +0000 (13:20 -0500)

Trivial merge