]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Fri, 4 Apr 2014 13:52:05 +0000 (09:52 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 4 Apr 2014 13:52:05 +0000 (09:52 -0400)

Trivial merge