]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sun, 16 Feb 2014 17:46:38 +0000 (12:46 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 16 Feb 2014 17:46:38 +0000 (12:46 -0500)

Trivial merge