]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sun, 2 Dec 2012 15:53:48 +0000 (10:53 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 2 Dec 2012 15:53:48 +0000 (10:53 -0500)

Trivial merge