]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 17:12:49 +0000 (11:12 -0600)
committerBenjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 17:12:49 +0000 (11:12 -0600)

Trivial merge