]> granicus.if.org Git - python/commitdiff
merge 3.5 (closes #27968)
authorBenjamin Peterson <benjamin@python.org>
Wed, 7 Sep 2016 16:00:57 +0000 (09:00 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 7 Sep 2016 16:00:57 +0000 (09:00 -0700)

Trivial merge