]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 16:16:07 +0000 (12:16 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 16:16:07 +0000 (12:16 -0400)

Trivial merge