]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Wed, 6 Jul 2016 21:04:11 +0000 (14:04 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 6 Jul 2016 21:04:11 +0000 (14:04 -0700)

Trivial merge