]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sat, 12 Oct 2013 19:55:33 +0000 (15:55 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 12 Oct 2013 19:55:33 +0000 (15:55 -0400)

Trivial merge