]> granicus.if.org Git - python/commitdiff
null merge 3.3 from backport
authorBenjamin Peterson <benjamin@python.org>
Wed, 15 May 2013 03:32:34 +0000 (22:32 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 15 May 2013 03:32:34 +0000 (22:32 -0500)

Trivial merge