]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sun, 20 Jan 2013 15:05:28 +0000 (10:05 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 20 Jan 2013 15:05:28 +0000 (10:05 -0500)

Trivial merge