]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Mon, 20 May 2013 02:39:46 +0000 (19:39 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 20 May 2013 02:39:46 +0000 (19:39 -0700)

Trivial merge