]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sun, 2 Dec 2012 17:37:09 +0000 (12:37 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 2 Dec 2012 17:37:09 +0000 (12:37 -0500)

Trivial merge