]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sat, 19 Jan 2013 19:58:51 +0000 (14:58 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 19 Jan 2013 19:58:51 +0000 (14:58 -0500)

Trivial merge